Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4160855 authored by Artem Bityutskiy's avatar Artem Bityutskiy Committed by David Woodhouse
Browse files

[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: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent 992c9d24

drivers/mtd/chips/cfi_cmdset_0001.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

		}



		/*

include/linux/mtd/mtd.h

+0 −10
Original line number Diff line number Diff line
@@ -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;