diff options
| author | Marek Vasut | 2015-09-03 18:35:37 +0200 |
|---|---|---|
| committer | Brian Norris | 2015-09-12 00:48:43 +0200 |
| commit | 61528d888adf9470db73aaadf1ff9ca35942262a (patch) | |
| tree | d83f422127c6865eb30539a0ac0624a73291362f /drivers/mtd/nand | |
| parent | mtd: spi-nor: Decouple SPI NOR's device_node from controller device (diff) | |
| download | kernel-qcow2-linux-61528d888adf9470db73aaadf1ff9ca35942262a.tar.gz kernel-qcow2-linux-61528d888adf9470db73aaadf1ff9ca35942262a.tar.xz kernel-qcow2-linux-61528d888adf9470db73aaadf1ff9ca35942262a.zip | |
mtd: nand: Rename nand_chip .dn to .flash_node
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>
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/brcmnand/brcmnand.c | 5 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_base.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index fddb795eeb71..048e4e030fc8 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -1792,7 +1792,8 @@ static int brcmnand_setup_dev(struct brcmnand_host *host) 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); if (ret) { /* Use detected size */ @@ -1899,7 +1900,7 @@ static int brcmnand_init_cs(struct brcmnand_host *host) mtd = &host->mtd; chip = &host->chip; - chip->dn = dn; + chip->flash_node = dn; chip->priv = host; mtd->priv = chip; mtd->name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "brcmnand.%d", diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index ceb68ca8277a..51f7816d67c9 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -3846,8 +3846,8 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips, struct nand_flash_dev *type; int ret; - if (chip->dn) { - ret = nand_dt_init(mtd, chip, chip->dn); + if (chip->flash_node) { + ret = nand_dt_init(mtd, chip, chip->flash_node); if (ret) return ret; } |