From: Artem Bityutskiy Date: Mon, 4 Mar 2013 12:56:18 +0000 (+0200) Subject: mtd: nand: use NAND_HAS_CACHEPROG X-Git-Tag: next-20130312~52^2~14 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef551f5ae9df4b832f870670a8e6edddc5506cff;p=karo-tx-linux.git mtd: nand: use NAND_HAS_CACHEPROG We have this unused macro, let's use it and justify its existence. Signed-off-by: Artem Bityutskiy Acked-by: Brian Norris --- diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 79b1081d7441..a79cd82ba981 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -2043,7 +2043,7 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip, */ cached = 0; - if (!cached || !(chip->options & NAND_CACHEPRG)) { + if (!cached || !NAND_HAS_CACHEPROG(chip)) { chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1); status = chip->waitfunc(mtd, chip); diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 9af859fc7b45..59dee20a1618 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -160,7 +160,7 @@ typedef enum { #define NAND_SUBPAGE_READ 0x00001000 /* Options valid for Samsung large page devices */ -#define NAND_SAMSUNG_LP_OPTIONS (NAND_CACHEPRG) +#define NAND_SAMSUNG_LP_OPTIONS NAND_CACHEPRG /* Macros to identify the above */ #define NAND_HAS_CACHEPROG(chip) ((chip->options & NAND_CACHEPRG))