| Message ID | 20170902084938.15942-1-clabbe.montjoie@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Boris Brezillon |
| Headers | show |
| Series | mtd: nand: remove unused blockmask variable | expand |
On Sat, 2 Sep 2017 10:49:38 +0200 Corentin Labbe <clabbe.montjoie@gmail.com> wrote: > This patch fix the following build warning: > drivers/mtd/nand/nand_base.c:2671:30: attention : variable ‘blockmask’ set but not used [-Wunused-but-set-variable] Applied. Thanks, Boris > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- > drivers/mtd/nand/nand_base.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index 9900476a0afe..b875fd365084 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -2668,7 +2668,7 @@ static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len, > static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, > struct mtd_oob_ops *ops) > { > - int chipnr, realpage, page, blockmask, column; > + int chipnr, realpage, page, column; > struct nand_chip *chip = mtd_to_nand(mtd); > uint32_t writelen = ops->len; > > @@ -2704,7 +2704,6 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, > > realpage = (int)(to >> chip->page_shift); > page = realpage & chip->pagemask; > - blockmask = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1; > > /* Invalidate the page cache, when we write to the cached page */ > if (to <= ((loff_t)chip->pagebuf << chip->page_shift) &&
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 9900476a0afe..b875fd365084 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2668,7 +2668,7 @@ static uint8_t *nand_fill_oob(struct mtd_info *mtd, uint8_t *oob, size_t len, static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops) { - int chipnr, realpage, page, blockmask, column; + int chipnr, realpage, page, column; struct nand_chip *chip = mtd_to_nand(mtd); uint32_t writelen = ops->len; @@ -2704,7 +2704,6 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to, realpage = (int)(to >> chip->page_shift); page = realpage & chip->pagemask; - blockmask = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1; /* Invalidate the page cache, when we write to the cached page */ if (to <= ((loff_t)chip->pagebuf << chip->page_shift) &&
This patch fix the following build warning: drivers/mtd/nand/nand_base.c:2671:30: attention : variable ‘blockmask’ set but not used [-Wunused-but-set-variable] Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> --- drivers/mtd/nand/nand_base.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)