mtd: plat_nand: use default partition probe

It's harmless to add 'ofpart' (the only different parser supported in
default mtdpart.c) to plat_nand. That let's us kill off one more custom
partition prober listing.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 4535c263fae576e59b87594f924c2deb5ed0f3e1..717cf623fcdef81a761940cee99ceed616501d66 100644 (file)
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -24,8 +24,6 @@ struct plat_nand_data {
        void __iomem            *io_base;
 };
 
-static const char *part_probe_types[] = { "cmdlinepart", NULL };
-
 /*
  * Probe for the NAND device.
  */
@@ -95,7 +93,7 @@ static int plat_nand_probe(struct platform_device *pdev)
                goto out;
        }
 
-       part_types = pdata->chip.part_probe_types ? : part_probe_types;
+       part_types = pdata->chip.part_probe_types;
 
        ppdata.of_node = pdev->dev.of_node;
        err = mtd_device_parse_register(&data->mtd, part_types, &ppdata,

diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index 3f81dc8f214cdc0240c8a7d07cee734b96d544f1..3b28db458ea042794913dffed7c160c29d24b189 100644 (file)
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -160,14 +160,10 @@ static int xway_nand_probe(struct platform_device *pdev)
        return 0;
 }
 
-/* allow users to override the partition in DT using the cmdline */
-static const char *part_probes[] = { "cmdlinepart", "ofpart", NULL };
-
 static struct platform_nand_data xway_nand_data = {
        .chip = {
                .nr_chips               = 1,
                .chip_delay             = 30,
-               .part_probe_types       = part_probes,
        },
        .ctrl = {
                .probe          = xway_nand_probe,