mtd: nand: drop unnecessary partition parser data

[deliverable/linux.git] / drivers / mtd / nand / plat_nand.c

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 65b9dbbe6d6a4b899f30935f91ae491979f1d8a0..06ac6c64dcd53e1b81575a5397bcae46bdfad348 100644 (file)
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -30,7 +30,6 @@ struct plat_nand_data {
 static int plat_nand_probe(struct platform_device *pdev)
 {
        struct platform_nand_data *pdata = dev_get_platdata(&pdev->dev);
-       struct mtd_part_parser_data ppdata;
        struct plat_nand_data *data;
        struct resource *res;
        const char **part_types;
@@ -58,6 +57,7 @@ static int plat_nand_probe(struct platform_device *pdev)
                return PTR_ERR(data->io_base);
 
        data->chip.priv = &data;
+       nand_set_flash_node(&data->chip, pdev->dev.of_node);
        data->mtd.priv = &data->chip;
        data->mtd.dev.parent = &pdev->dev;
 
@@ -94,8 +94,7 @@ static int plat_nand_probe(struct platform_device *pdev)
 
        part_types = pdata->chip.part_probe_types;
 
-       ppdata.of_node = pdev->dev.of_node;
-       err = mtd_device_parse_register(&data->mtd, part_types, &ppdata,
+       err = mtd_device_parse_register(&data->mtd, part_types, NULL,
                                        pdata->chip.partitions,
                                        pdata->chip.nr_partitions);