diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2016-01-04 10:32:54 -0800 |
|---|---|---|
| committer |   Brian Norris <computersforpeace@gmail.com> | 2016-01-05 15:57:59 -0800 |
| commit | 887e9d3a1f3e93a1c64294649c0dd301035a7892 (patch) | |
| tree | 3ff03d2cba051ab74a5afa5299519a4509973df2 /drivers/mtd | |
| parent | mtd: sh_flctl: pass FIFO as physical address (diff) | |
| download | linux-dev-887e9d3a1f3e93a1c64294649c0dd301035a7892.tar.xz linux-dev-887e9d3a1f3e93a1c64294649c0dd301035a7892.zip | |
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@canb.auug.org.au>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/ndfc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 0709ea9dd8ed..7d72f4fe06a1 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) { |