From: Akinobu Mita Date: Sun, 28 Jul 2013 02:21:55 +0000 (+0900) Subject: mtd: nandsim: simplify NS_RAW_OFFSET() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b8b8fa1ede2ea9f52a550fdddf2dda53ce52fc8;p=openwrt%2Fstaging%2Fblogic.git mtd: nandsim: simplify NS_RAW_OFFSET() Simplify the definision of NS_RAW_OFFSET() by using (ns)->geom.pgszoob which holds the sum of page size and OOB size. Signed-off-by: Akinobu Mita Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index ac1b46cbd33e..7aa7b19d2c13 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c @@ -205,7 +205,7 @@ MODULE_PARM_DESC(bch, "Enable BCH ecc and set how many bits should " /* Calculate the page offset in flash RAM image by (row, column) address */ #define NS_RAW_OFFSET(ns) \ - (((ns)->regs.row << (ns)->geom.pgshift) + ((ns)->regs.row * (ns)->geom.oobsz) + (ns)->regs.column) + (((ns)->regs.row * (ns)->geom.pgszoob) + (ns)->regs.column) /* Calculate the OOB offset in flash RAM image by (row, column) address */ #define NS_RAW_OFFSET_OOB(ns) (NS_RAW_OFFSET(ns) + ns->geom.pgsz)