aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/onenand/generic.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-06-02 10:01:10 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:10 -0400
commit92ffb00d11b24e69cc87a0c0aa5de172d9de8e13 (patch)
tree54f31f73da85161c910d70762d639ed7cff017db /drivers/mtd/onenand/generic.c
parent9e58c5d42ff69e7d99cc8e37082f58ba44e7fa7d (diff)
mtd: onenand/generic.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/onenand/generic.c')
-rw-r--r--drivers/mtd/onenand/generic.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index bca1c496135f..8152a3160b12 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -32,7 +32,6 @@
32 32
33struct onenand_info { 33struct onenand_info {
34 struct mtd_info mtd; 34 struct mtd_info mtd;
35 struct mtd_partition *parts;
36 struct onenand_chip onenand; 35 struct onenand_chip onenand;
37}; 36};
38 37
@@ -71,13 +70,9 @@ static int __devinit generic_onenand_probe(struct platform_device *pdev)
71 goto out_iounmap; 70 goto out_iounmap;
72 } 71 }
73 72
74 err = parse_mtd_partitions(&info->mtd, NULL, &info->parts, 0); 73 err = mtd_device_parse_register(&info->mtd, NULL, 0,
75 if (err > 0) 74 pdata ? pdata->parts : NULL,
76 mtd_device_register(&info->mtd, info->parts, err); 75 pdata ? pdata->nr_parts : 0);
77 else if (err <= 0 && pdata && pdata->parts)
78 mtd_device_register(&info->mtd, pdata->parts, pdata->nr_parts);
79 else
80 err = mtd_device_register(&info->mtd, NULL, 0);
81 76
82 platform_set_drvdata(pdev, info); 77 platform_set_drvdata(pdev, info);
83 78