diff options
author | Artem Bityutskiy | 2013-03-04 15:05:00 +0100 |
---|---|---|
committer | David Woodhouse | 2013-04-05 13:02:41 +0200 |
commit | 68aa352de28235bccdcee96ddf49f7628e93ec6f (patch) | |
tree | 9e68e5c8dd68951adad97b9a115bc8c8d4b71dc9 /drivers/mtd/nand/pxa3xx_nand.c | |
parent | mtd: nand: use NAND_HAS_CACHEPROG (diff) | |
download | kernel-qcow2-linux-68aa352de28235bccdcee96ddf49f7628e93ec6f.tar.gz kernel-qcow2-linux-68aa352de28235bccdcee96ddf49f7628e93ec6f.tar.xz kernel-qcow2-linux-68aa352de28235bccdcee96ddf49f7628e93ec6f.zip |
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/nand/pxa3xx_nand.c')
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) } pxa3xx_flash_ids[0].name = f->name; - pxa3xx_flash_ids[0].id = (f->chip_id >> 8) & 0xffff; + pxa3xx_flash_ids[0].dev_id = (f->chip_id >> 8) & 0xffff; pxa3xx_flash_ids[0].pagesize = f->page_size; chipsize = (uint64_t)f->num_blocks * f->page_per_block * f->page_size; pxa3xx_flash_ids[0].chipsize = chipsize >> 20; |