diff options
| author | Dmitry Eremin-Solenikov | 2011-05-29 23:02:24 +0200 |
|---|---|---|
| committer | Artem Bityutskiy | 2011-09-11 14:02:11 +0200 |
| commit | b3702ea4915363102870a6af60d06d655ca4a09d (patch) | |
| tree | 15a5bf501f905f6529f224430ddbfafb7ce671b1 /drivers | |
| parent | mtd: fsl_upm: use ofpart through generic parsing (diff) | |
| download | kernel-qcow2-linux-b3702ea4915363102870a6af60d06d655ca4a09d.tar.gz kernel-qcow2-linux-b3702ea4915363102870a6af60d06d655ca4a09d.tar.xz kernel-qcow2-linux-b3702ea4915363102870a6af60d06d655ca4a09d.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 8 |
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) int resettime = 0; int retval = 0; int rev, len; + struct mtd_part_parser_data ppdata; /* * Check SoC revision. This driver supports only NFC @@ -725,6 +726,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op) } mtd->name = "MPC5121 NAND"; + ppdata.of_node = dn; chip->dev_ready = mpc5121_nfc_dev_ready; chip->cmdfunc = mpc5121_nfc_command; chip->read_byte = mpc5121_nfc_read_byte; @@ -836,11 +838,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op) dev_set_drvdata(dev, mtd); /* Register device in MTD */ - retval = parse_mtd_partitions(mtd, NULL, &parts, 0); -#ifdef CONFIG_MTD_OF_PARTS - if (retval == 0) - retval = of_mtd_parse_partitions(dev, dn, &parts); -#endif + retval = parse_mtd_partitions(mtd, NULL, &parts, &ppdata); if (retval < 0) { dev_err(dev, "Error parsing MTD partitions!\n"); devm_free_irq(dev, prv->irq, mtd); |