Commit 887e9d3a authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Brian Norris

mtd: nand: fix for drop unnecessary partition parser data

From Stephen:

    Hi Brian,

    After merging the l2-mtd tree, today's linux-next build (powerpc
    ppc44x_defconfig) failed like this:

    drivers/mtd/nand/ndfc.c: In function 'ndfc_chip_init':
    drivers/mtd/nand/ndfc.c:177:2: error: 'ppdata' undeclared (first use in this function)
      ppdata.of_node = flash_np;
      ^

    Caused by commit

      a61ae81a ("mtd: nand: drop unnecessary partition parser data")

The flash node is already correctly assigned using the new helper
(nand_set_flash_node()) so the correct fix is indeed to simply drop this
line.

Fixes: a61ae81a ("mtd: nand: drop unnecessary partition parser data")
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 1873315f
...@@ -174,7 +174,6 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc, ...@@ -174,7 +174,6 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
return -ENODEV; return -ENODEV;
nand_set_flash_node(chip, flash_np); nand_set_flash_node(chip, flash_np);
ppdata.of_node = flash_np;
mtd->name = kasprintf(GFP_KERNEL, "%s.%s", dev_name(&ndfc->ofdev->dev), mtd->name = kasprintf(GFP_KERNEL, "%s.%s", dev_name(&ndfc->ofdev->dev),
flash_np->name); flash_np->name);
if (!mtd->name) { if (!mtd->name) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment