mtd: nand: fix for drop unnecessary partition parser data

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=887e9d3a1f3e93a1c64294649c0dd301035a7892
Commit:     887e9d3a1f3e93a1c64294649c0dd301035a7892
Parent:     1873315fb156cbc8e46f28e8b128f17ff6c31728
Author:     Stephen Rothwell <sfr at canb.auug.org.au>
AuthorDate: Mon Jan 4 10:32:54 2016 -0800
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Jan 5 15:57:59 2016 -0800

    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
    
          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 at canb.auug.org.au>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/nand/ndfc.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 0709ea9..7d72f4f 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -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) {