summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/pxa3xx_nand.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-06-02 18:00:59 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:09 +0300
commitee0f6a15b3f9246ae11e581cb9dae8fb2cc5da5c (patch)
tree7e2d1bfc3e339e820437b028b889b2e6e6a611b9 /drivers/mtd/nand/pxa3xx_nand.c
parent725b75a4acd34e39685483864e824b430e55e2ac (diff)
mtd: pxa3xx_nand.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 <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/nand/pxa3xx_nand.c')
-rw-r--r--drivers/mtd/nand/pxa3xx_nand.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 5c3af2f72a62..b7db1b2021f2 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1133,8 +1133,6 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
{
struct pxa3xx_nand_platform_data *pdata;
struct pxa3xx_nand_info *info;
- struct mtd_partition *parts;
- int nr_parts;
pdata = pdev->dev.platform_data;
if (!pdata) {
@@ -1152,13 +1150,8 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
return -ENODEV;
}
-
- nr_parts = parse_mtd_partitions(info->mtd, NULL, &parts, 0);
-
- if (nr_parts)
- return mtd_device_register(info->mtd, parts, nr_parts);
-
- return mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
+ return mtd_device_parse_register(info->mtd, NULL, 0,
+ pdata->parts, pdata->nr_parts);
}
#ifdef CONFIG_PM