summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov2011-06-02 16:00:36 +0200
committerArtem Bityutskiy2011-09-11 14:02:12 +0200
commit99add4228fce515fe113282147a0aab74afa29ae (patch)
tree43c3f562f5cd3706e40f822458f9aec5c3d3cff2 /drivers
parentmtd: m25p80.c: use mtd_device_parse_register (diff)
downloadkernel-qcow2-linux-99add4228fce515fe113282147a0aab74afa29ae.tar.gz
kernel-qcow2-linux-99add4228fce515fe113282147a0aab74afa29ae.tar.xz
kernel-qcow2-linux-99add4228fce515fe113282147a0aab74afa29ae.zip
mtd: fsl_elbc_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 <dedekind1@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/fsl_elbc_nand.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 4d225ba33a64..915b4a4c06c2 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -843,7 +843,6 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev)
struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl;
static const char *part_probe_types[]
= { "cmdlinepart", "RedBoot", "ofpart", NULL };
- struct mtd_partition *parts;
int ret;
int bank;
struct device *dev;
@@ -936,11 +935,8 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev)
/* First look for RedBoot table or partitions on the command
* line, these take precedence over device tree information */
- ret = parse_mtd_partitions(&priv->mtd, part_probe_types, &parts, &ppdata);
- if (ret < 0)
- goto err;
-
- mtd_device_register(&priv->mtd, parts, ret);
+ mtd_device_parse_register(&priv->mtd, part_probe_types, &ppdata,
+ NULL, 0);
printk(KERN_INFO "eLBC NAND device at 0x%llx, bank %d\n",
(unsigned long long)res.start, priv->bank);