[MTD] [NOR] Intel: remove ugly PROGREGION macros

Remove ugly and weird MTD_PROGREGION_CTRLMODE_VALID() and
MTD_PROGREGION_CTRLMODE_INVALID() macros. There is only one
user of them and they are used locally just for printing.

Anyway, this patch is a preparation for removing mtd->ecctype
and mtd->eccsize, but these macros use them. Fix this.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index d40262518b25..f334959a335b 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -560,13 +560,11 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
                         struct cfi_intelext_programming_regioninfo *prinfo;
                         prinfo = (struct cfi_intelext_programming_regioninfo *)&extp->extra[offs];
                         mtd->writesize = cfi->interleave << prinfo->ProgRegShift;
-                        MTD_PROGREGION_CTRLMODE_VALID(mtd) = cfi->interleave * prinfo->ControlValid;
-                        MTD_PROGREGION_CTRLMODE_INVALID(mtd) = cfi->interleave * prinfo->ControlInvalid;
                         mtd->flags &= ~MTD_BIT_WRITEABLE;
                         printk(KERN_DEBUG "%s: program region size/ctrl_valid/ctrl_inval = %d/%d/%d\n",
                                map->name, mtd->writesize,
-                               MTD_PROGREGION_CTRLMODE_VALID(mtd),
-                               MTD_PROGREGION_CTRLMODE_INVALID(mtd));
+                               cfi->interleave * prinfo->ControlValid,
+                               cfi->interleave * prinfo->ControlInvalid);
                 }
 
                 /*