nand: constify id/manu tables
Subsystems (2)
PATCH 1/1 nand: constify id/manu tables
These id tables need not be writable.
--- drivers/mtd/nand/nand_base.c | 6 +++--- drivers/mtd/nand/nand_ids.c | 4 ++-- include/linux/mtd/nand.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/mtd/nand/nand_base.c +3 -3
@@ -2409,11 +2409,11 @@ static void nand_set_defaults(struct nand_chip *chip, int busw)/* * Get the flash and manufacturer id and lookup if the type is supported */ -static struct nand_flash_dev *nand_get_flash_type (struct mtd_info *mtd, +static const struct nand_flash_dev *nand_get_flash_type (struct mtd_info *mtd,struct nand_chip *chip,int busw,int *maf_id) { -struct nand_flash_dev *type =NULL ; +const struct nand_flash_dev *type =NULL ;int i, dev_id, maf_idx;int tmp_id, tmp_manf;
@@ -2587,7 +2587,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips) {int i, busw, nand_maf_id;struct nand_chip *chip = mtd->priv; -struct nand_flash_dev *type; +const struct nand_flash_dev *type;/* Get buswidth to select the correct functions */ busw = chip->options &NAND_BUSWIDTH_16 ;
drivers/mtd/nand/nand_ids.c +2 -2
@@ -22,7 +22,7 @@+ 256 256 Byte page size * 512 512 Byte page size */ -struct nand_flash_dev nand_flash_ids[] = { +const struct nand_flash_dev nand_flash_ids[] = {#ifdef CONFIG_MTD_NAND_MUSEUM_IDS {"NAND 1MiB 5V 8-bit", 0x6e, 256, 1, 0x1000, 0},
@@ -132,7 +132,7 @@ struct nand_flash_dev nand_flash_ids[] = {/* * Manufacturer ID list */ -struct nand_manufacturers nand_manuf_ids[] = { +const struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_TOSHIBA ,"Toshiba" }, {NAND_MFR_SAMSUNG ,"Samsung" }, {NAND_MFR_FUJITSU ,"Fujitsu" },
include/linux/mtd/nand.h +2 -2
@@ -470,8 +470,8 @@ struct nand_manufacturers {char * name; }; -extern struct nand_flash_dev nand_flash_ids[]; -extern struct nand_manufacturers nand_manuf_ids[]; +extern const struct nand_flash_dev nand_flash_ids[]; +extern const struct nand_manufacturers nand_manuf_ids[];extern int nand_scan_bbt (struct mtd_info *mtd,struct nand_bbt_descr *bd);extern int nand_update_bbt (struct mtd_info *mtd,loff_t offs);
Signature · 1 line
1.7.3.1
PATCH 1/1 nand: constify id/manu tables
Quoted 1 line · On Wednesday, October 20, 2010 07:15:21 Mike Frysinger wrote:
These id tables need not be writable.
was this missed ? or is something pending ?
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
Url : http://lists.denx.de/pipermail/u-boot/attachments/20101207/c43c447a/attachment.pgp
PATCH 1/1 nand: constify id/manu tables
Quoted 4 lines · On Tue, 7 Dec 2010 17:14:14 -0500 Mike Frysinger <[email protected]> wrote:
Quoted 1 line · On Wednesday, October 20, 2010 07:15:21 Mike Frysinger wrote:
These id tables need not be writable.
was this missed ? or is something pending ?
Current batch was fixes for the imminent release; this looked like a cleanup which I'll stick in -next shortly.
-Scott
Quoted 9 lines · Mike Frysinger
These id tables need not be writable.
Signed-off-by Mike Frysinger <[email protected]>---
drivers/mtd/nand/nand_base.c| 6 +++---drivers/mtd/nand/nand_ids.c | 4 ++-- include/linux/mtd/nand.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
Applied to u-boot-nand-flash next.
-Scott