diff options
author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2013-03-04 16:05:00 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-04-05 12:02:41 +0100 |
commit | 68aa352de28235bccdcee96ddf49f7628e93ec6f (patch) | |
tree | 9e68e5c8dd68951adad97b9a115bc8c8d4b71dc9 /include | |
parent | 3239a6cdef0be60ec2dadc501cf385dc419d7452 (diff) | |
download | linux-68aa352de28235bccdcee96ddf49f7628e93ec6f.tar.gz linux-68aa352de28235bccdcee96ddf49f7628e93ec6f.tar.bz2 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 'include')
-rw-r--r-- | include/linux/mtd/nand.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 07d7a3dc5582..9aed31a49af1 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -548,19 +548,18 @@ struct nand_chip { /** * struct nand_flash_dev - NAND Flash Device ID Structure - * @name: Identify the device type - * @id: device ID code - * @pagesize: Pagesize in bytes. Either 256 or 512 or 0 - * If the pagesize is 0, then the real pagesize - * and the eraseize are determined from the - * extended id bytes in the chip - * @erasesize: Size of an erase block in the flash device. - * @chipsize: Total chipsize in Mega Bytes - * @options: Bitfield to store chip relevant options + * @name: a human-readable name of the NAND chip + * @dev_id: the device ID (the second byte of the full chip ID array) + * @pagesize: size of the NAND page in bytes; if 0, then the real page size (as + * well as the eraseblock size) is determined from the extended NAND + * chip ID array) + * @erasesize: eraseblock size in bytes (determined from the extended ID if 0) + * @chipsize: total chip size in MiB + * @options: stores various chip bit options */ struct nand_flash_dev { char *name; - int id; + int dev_id; unsigned long pagesize; unsigned long chipsize; unsigned long erasesize; |