mtd: nand: fix for drop unnecessary partition parser data
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 4 Jan 2016 18:32:54 +0000 (10:32 -0800)
committerBrian Norris <computersforpeace@gmail.com>
Tue, 5 Jan 2016 23:57:59 +0000 (15:57 -0800)
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

      a61ae81a1907 ("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: a61ae81a1907 ("mtd: nand: drop unnecessary partition parser data")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
drivers/mtd/nand/ndfc.c

index 0709ea9dd8ede619270a1653e976114cd39a2861..7d72f4fe06a138c1e20bcba115542180342a45db 100644 (file)
@@ -174,7 +174,6 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
                return -ENODEV;
        nand_set_flash_node(chip, flash_np);
 
-       ppdata.of_node = flash_np;
        mtd->name = kasprintf(GFP_KERNEL, "%s.%s", dev_name(&ndfc->ofdev->dev),
                              flash_np->name);
        if (!mtd->name) {