cmd001: remove ugly macros

PATCH New Artem Bityutskiy 1 participant 1 message Jan 30, 2007 Memory technology devices (MTD)

lore

Share & tools

lore

Artem Bityutskiy

author

2007-01-30 11:42 UTC #0 lore raw

PATCH 1/1 cmd001: remove ugly macros

Signature · 3 lines

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)

Quoted 1 line

From adbf8ff3a658bf857b2f2025c19b43066319064c Mon Sep 17 00:00:00 2001

From: Artem Bityutskiy <[email protected]>
Date: Tue, 30 Jan 2007 10:45:55 +0200
Subject: [PATCH] [MTD] cmd001: remove ugly 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 <[email protected]>

---
 drivers/mtd/chips/cfi_cmdset_0001.c |    6 ++----
 include/linux/mtd/mtd.h             |   10 ----------
 2 files changed, 2 insertions(+), 14 deletions(-)

drivers/mtd/chips/cfi_cmdset_0001.c +2 -4

index f69184a..303b713 100644
@@ -546,13 +546,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);
 		}
 
 		/*

include/linux/mtd/mtd.h +0 ~~-10~~

index d644e57..afab253 100644
@@ -120,16 +120,6 @@ struct mtd_info {
 	u_int32_t ecctype;
 	u_int32_t eccsize;
 
-	/*
-	 * Reuse some of the above unused fields in the case of NOR flash
-	 * with configurable programming regions to avoid modifying the
-	 * user visible structure layout/size.  Only valid when the
-	 * MTD_PROGRAM_REGIONS flag is set.
-	 * (Maybe we should have an union for those?)
-	 */
-#define MTD_PROGREGION_CTRLMODE_VALID(mtd)  (mtd)->oobsize
-#define MTD_PROGREGION_CTRLMODE_INVALID(mtd)  (mtd)->ecctype
-
 	// Kernel-only stuff starts here.
 	char *name;
 	int index;

Signature · 1 line

1.4.4.2