aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 17:02:24 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:11 -0400
commitb3702ea4915363102870a6af60d06d655ca4a09d (patch)
tree15a5bf501f905f6529f224430ddbfafb7ce671b1
parenta454a296aa8e63f5e5c749343a99fd25c37a3c44 (diff)
mtd: mpc5121_nfc: use ofpart through generic parsing
Convert the driver to use ofpart partitions parsing through the generic parse_mtd_partitions(). Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 30f78ea8e993..9380f96716f4 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -661,6 +661,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
661 int resettime = 0; 661 int resettime = 0;
662 int retval = 0; 662 int retval = 0;
663 int rev, len; 663 int rev, len;
664 struct mtd_part_parser_data ppdata;
664 665
665 /* 666 /*
666 * Check SoC revision. This driver supports only NFC 667 * Check SoC revision. This driver supports only NFC
@@ -725,6 +726,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
725 } 726 }
726 727
727 mtd->name = "MPC5121 NAND"; 728 mtd->name = "MPC5121 NAND";
729 ppdata.of_node = dn;
728 chip->dev_ready = mpc5121_nfc_dev_ready; 730 chip->dev_ready = mpc5121_nfc_dev_ready;
729 chip->cmdfunc = mpc5121_nfc_command; 731 chip->cmdfunc = mpc5121_nfc_command;
730 chip->read_byte = mpc5121_nfc_read_byte; 732 chip->read_byte = mpc5121_nfc_read_byte;
@@ -836,11 +838,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
836 dev_set_drvdata(dev, mtd); 838 dev_set_drvdata(dev, mtd);
837 839
838 /* Register device in MTD */ 840 /* Register device in MTD */
839 retval = parse_mtd_partitions(mtd, NULL, &parts, 0); 841 retval = parse_mtd_partitions(mtd, NULL, &parts, &ppdata);
840#ifdef CONFIG_MTD_OF_PARTS
841 if (retval == 0)
842 retval = of_mtd_parse_partitions(dev, dn, &parts);
843#endif
844 if (retval < 0) { 842 if (retval < 0) {
845 dev_err(dev, "Error parsing MTD partitions!\n"); 843 dev_err(dev, "Error parsing MTD partitions!\n");
846 devm_free_irq(dev, prv->irq, mtd); 844 devm_free_irq(dev, prv->irq, mtd);