From 3cf0aa4519dcb682b7c6501dcf373ca6597cde17 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Thu, 2 Jun 2011 18:00:36 +0400 Subject: [PATCH] --- yaml --- r: 274879 b: refs/heads/master c: 99add4228fce515fe113282147a0aab74afa29ae h: refs/heads/master i: 274877: f91ab05d37f09505860b23e8a020d3b735b41236 274875: af7c2580591925ff67c7aabe94609867b494b22f 274871: 6b2ab68b15f5c7a533f1d8b7e1be3b22840df707 274863: f0c62a57ee34d3558456faf1758a2fefe9f8f95b 274847: a4cbcf2838ff518e5f04b9d59de221d04fb704aa 274815: 151db1354bbc86308ea678831cddc39e02d2a7c2 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/fsl_elbc_nand.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f9cf0871dd29..dd426349a882 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 871770b5c857aa39e87785726ce3ec5a41cd387a +refs/heads/master: 99add4228fce515fe113282147a0aab74afa29ae diff --git a/trunk/drivers/mtd/nand/fsl_elbc_nand.c b/trunk/drivers/mtd/nand/fsl_elbc_nand.c index 4d225ba33a64..915b4a4c06c2 100644 --- a/trunk/drivers/mtd/nand/fsl_elbc_nand.c +++ b/trunk/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);