UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: mpc5121_nfc.c: use mtd_device_parse_register 

Replace custom invocations of parse_mtd_partitions and mtd_device_register
with common mtd_device_parse_register call. This would bring: standard
handling of all errors, fallback to default partitions, etc.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-06-02 18:00:42 +04:00 committed by Artem Bityutskiy
parent 73f36b3e25
commit a9093f064e
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mtd/nand/mpc5121_nfc.c
View File

@ -654,7 +654,6 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
struct mpc5121_nfc_prv *prv; struct mpc5121_nfc_prv *prv;
struct resource res; struct resource res;
struct mtd_info *mtd; struct mtd_info *mtd;
struct mtd_partition *parts;
struct nand_chip *chip; struct nand_chip *chip;
unsigned long regs_paddr, regs_size; unsigned long regs_paddr, regs_size;
const __be32 *chips_no; const __be32 *chips_no;
@ -838,15 +837,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
dev_set_drvdata(dev, mtd); dev_set_drvdata(dev, mtd);
/* Register device in MTD */ /* Register device in MTD */
retval = parse_mtd_partitions(mtd, NULL, &parts, &ppdata); retval = mtd_device_parse_register(mtd, NULL, &ppdata, NULL, 0);
if (retval < 0) {
dev_err(dev, "Error parsing MTD partitions!\n");
devm_free_irq(dev, prv->irq, mtd);
retval = -EINVAL;
goto error;
}
retval = mtd_device_register(mtd, parts, retval);
if (retval) { if (retval) {
dev_err(dev, "Error adding MTD device!\n"); dev_err(dev, "Error adding MTD device!\n");
devm_free_irq(dev, prv->irq, mtd); devm_free_irq(dev, prv->irq, mtd);