Skip to contentSkip to conversation

mtd: plat_nand: use default partition probe

PATCH New Brian Norris 1 participant 1 message May 18, 2015

Subsystems (2)
Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Brian Norris

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/mtd/nand/plat_nand.c | 4 +---
 drivers/mtd/nand/xway_nand.c | 4 ----
 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/mtd/nand/plat_nand.c +1 -3
index 4535c263fae5..717cf623fcde 100644
@@ -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,
drivers/mtd/nand/xway_nand.c +0 -4
index 3f81dc8f214c..3b28db458ea0 100644
@@ -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,
Signature · 1 line
1.9.1