diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-03-04 09:05:00 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 07:02:41 -0400 |
commit | 68aa352de28235bccdcee96ddf49f7628e93ec6f (patch) | |
tree | 9e68e5c8dd68951adad97b9a115bc8c8d4b71dc9 /drivers/mtd | |
parent | 3239a6cdef0be60ec2dadc501cf385dc419d7452 (diff) |
mtd: nand: rename the id field of 'struct nand_flash_dev'
The 'id' is a bit confusing name because NAND IDs are multi-byte. Re-name
it to 'dev_id' to make it clear that this is the "device ID" part (the second
byte).
While on it, clean-up the commentary for 'struct nand_flash_dev'.
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/devices/doc2000.c | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001.c | 2 | ||||
-rw-r--r-- | drivers/mtd/devices/doc2001plus.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nand_base.c | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/nandsim.c | 6 | ||||
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c index a4eb8b5b85ec..363ec3c55d92 100644 --- a/drivers/mtd/devices/doc2000.c +++ b/drivers/mtd/devices/doc2000.c | |||
@@ -379,7 +379,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip) | |||
379 | 379 | ||
380 | /* Print and store the manufacturer and ID codes. */ | 380 | /* Print and store the manufacturer and ID codes. */ |
381 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { | 381 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { |
382 | if (id == nand_flash_ids[i].id) { | 382 | if (id == nand_flash_ids[i].dev_id) { |
383 | /* Try to identify manufacturer */ | 383 | /* Try to identify manufacturer */ |
384 | for (j = 0; nand_manuf_ids[j].id != 0x0; j++) { | 384 | for (j = 0; nand_manuf_ids[j].id != 0x0; j++) { |
385 | if (nand_manuf_ids[j].id == mfr) | 385 | if (nand_manuf_ids[j].id == mfr) |
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c index f6927955dab0..00644bb92cdf 100644 --- a/drivers/mtd/devices/doc2001.c +++ b/drivers/mtd/devices/doc2001.c | |||
@@ -206,7 +206,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip) | |||
206 | 206 | ||
207 | /* FIXME: to deal with multi-flash on multi-Millennium case more carefully */ | 207 | /* FIXME: to deal with multi-flash on multi-Millennium case more carefully */ |
208 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { | 208 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { |
209 | if ( id == nand_flash_ids[i].id) { | 209 | if ( id == nand_flash_ids[i].dev_id) { |
210 | /* Try to identify manufacturer */ | 210 | /* Try to identify manufacturer */ |
211 | for (j = 0; nand_manuf_ids[j].id != 0x0; j++) { | 211 | for (j = 0; nand_manuf_ids[j].id != 0x0; j++) { |
212 | if (nand_manuf_ids[j].id == mfr) | 212 | if (nand_manuf_ids[j].id == mfr) |
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c index 4f2220ad8924..1b0c12f3ec02 100644 --- a/drivers/mtd/devices/doc2001plus.c +++ b/drivers/mtd/devices/doc2001plus.c | |||
@@ -314,7 +314,7 @@ static int DoC_IdentChip(struct DiskOnChip *doc, int floor, int chip) | |||
314 | return 0; | 314 | return 0; |
315 | 315 | ||
316 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { | 316 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { |
317 | if (id == nand_flash_ids[i].id) { | 317 | if (id == nand_flash_ids[i].dev_id) { |
318 | /* Try to identify manufacturer */ | 318 | /* Try to identify manufacturer */ |
319 | for (j = 0; nand_manuf_ids[j].id != 0x0; j++) { | 319 | for (j = 0; nand_manuf_ids[j].id != 0x0; j++) { |
320 | if (nand_manuf_ids[j].id == mfr) | 320 | if (nand_manuf_ids[j].id == mfr) |
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 11ee9d47f53e..7c11abc84464 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c | |||
@@ -3142,7 +3142,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, | |||
3142 | type = nand_flash_ids; | 3142 | type = nand_flash_ids; |
3143 | 3143 | ||
3144 | for (; type->name != NULL; type++) | 3144 | for (; type->name != NULL; type++) |
3145 | if (*dev_id == type->id) | 3145 | if (*dev_id == type->dev_id) |
3146 | break; | 3146 | break; |
3147 | 3147 | ||
3148 | chip->onfi_version = 0; | 3148 | chip->onfi_version = 0; |
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c index 7199acc7e7f4..eb1238fc9067 100644 --- a/drivers/mtd/nand/nandsim.c +++ b/drivers/mtd/nand/nandsim.c | |||
@@ -766,9 +766,9 @@ static int init_nandsim(struct mtd_info *mtd) | |||
766 | } | 766 | } |
767 | 767 | ||
768 | /* Detect how many ID bytes the NAND chip outputs */ | 768 | /* Detect how many ID bytes the NAND chip outputs */ |
769 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { | 769 | for (i = 0; nand_flash_ids[i].name != NULL; i++) { |
770 | if (second_id_byte != nand_flash_ids[i].id) | 770 | if (second_id_byte != nand_flash_ids[i].dev_id) |
771 | continue; | 771 | continue; |
772 | } | 772 | } |
773 | 773 | ||
774 | if (ns->busw == 16) | 774 | if (ns->busw == 16) |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 37ee75c7bacb..dec80ca6a5ce 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -989,7 +989,7 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) | |||
989 | } | 989 | } |
990 | 990 | ||
991 | pxa3xx_flash_ids[0].name = f->name; | 991 | pxa3xx_flash_ids[0].name = f->name; |
992 | pxa3xx_flash_ids[0].id = (f->chip_id >> 8) & 0xffff; | 992 | pxa3xx_flash_ids[0].dev_id = (f->chip_id >> 8) & 0xffff; |
993 | pxa3xx_flash_ids[0].pagesize = f->page_size; | 993 | pxa3xx_flash_ids[0].pagesize = f->page_size; |
994 | chipsize = (uint64_t)f->num_blocks * f->page_per_block * f->page_size; | 994 | chipsize = (uint64_t)f->num_blocks * f->page_per_block * f->page_size; |
995 | pxa3xx_flash_ids[0].chipsize = chipsize >> 20; | 995 | pxa3xx_flash_ids[0].chipsize = chipsize >> 20; |