Skip to content

Commit

Permalink
mtd: mpc5121_nfc: use ofpart through generic parsing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent a454a29 commit b3702ea
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/mtd/nand/mpc5121_nfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b3702ea

Please sign in to comment.