evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mtd: nand: Rename nand_chip .dn to .flash_node

Browse source 
Use a more descriptive name for the device_node element in struct nand_chip .
This name matches the element name used for device_node property of a flash
in the spi-nor framework.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Marek Vasut 2015-09-03 18:35:37 +02:00 • committed by Brian Norris
parent 11bff0b70c
commit 61528d888a
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/mtd/nand/brcmnand/brcmnand.c
View file

@ -1792,7 +1792,8 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
memset(cfg, 0, sizeof(*cfg)); memset(cfg, 0, sizeof(*cfg));
ret = of_property_read_u32(chip->dn, "brcm,nand-oob-sector-size", ret = of_property_read_u32(chip->flash_node,
"brcm,nand-oob-sector-size",
&oob_sector); &oob_sector);
if (ret) { if (ret) {
/* Use detected size */ /* Use detected size */
@ -1899,7 +1900,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host)
mtd = &host->mtd; mtd = &host->mtd;
chip = &host->chip; chip = &host->chip;
chip->dn = dn; chip->flash_node = dn;
chip->priv = host; chip->priv = host;
mtd->priv = chip; mtd->priv = chip;
mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d", mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d",

4
drivers/mtd/nand/nand_base.c
View file

@ -3846,8 +3846,8 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips,
struct nand_flash_dev *type; struct nand_flash_dev *type;
int ret; int ret;
if (chip->dn) { if (chip->flash_node) {
ret = nand_dt_init(mtd, chip, chip->dn); ret = nand_dt_init(mtd, chip, chip->flash_node);
if (ret) if (ret)
return ret; return ret;
} }

4
include/linux/mtd/nand.h
View file

@ -544,7 +544,7 @@ struct nand_buffers {
* flash device * flash device
* @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the
* flash device. * flash device.
* @dn: [BOARDSPECIFIC] device node describing this instance * @flash_node: [BOARDSPECIFIC] device node describing this instance
* @read_byte: [REPLACEABLE] read one byte from the chip * @read_byte: [REPLACEABLE] read one byte from the chip
* @read_word: [REPLACEABLE] read one word from the chip * @read_word: [REPLACEABLE] read one word from the chip
* @write_byte: [REPLACEABLE] write a single byte to the chip on the * @write_byte: [REPLACEABLE] write a single byte to the chip on the
@ -647,7 +647,7 @@ struct nand_chip {
void __iomem *IO_ADDR_R; void __iomem *IO_ADDR_R;
void __iomem *IO_ADDR_W; void __iomem *IO_ADDR_W;
struct device_node *dn; struct device_node *flash_node;
uint8_t (*read_byte)(struct mtd_info *mtd); uint8_t (*read_byte)(struct mtd_info *mtd);
u16 (*read_word)(struct mtd_info *mtd); u16 (*read_word)(struct mtd_info *mtd);