]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mtd: jz4740_nand don't specify default parsing options
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sun, 29 May 2011 16:17:00 +0000 (20:17 +0400)
committerArtem Bityutskiy <artem.bityutskiy@intel.com>
Tue, 16 Aug 2011 13:44:13 +0000 (16:44 +0300)
Since 'cmdline, NULL' is now a default for parse_mtd_partitions, don't specify
this in every driver, instead pass NULL to force parse_mtd_partitions
to use default.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
drivers/mtd/nand/jz4740_nand.c

index 6e813daed068d359f66f3c2ffb65abf46d924a44..920719cbdb556fefc282ac3f466fcc7a8d226429 100644 (file)
@@ -251,10 +251,6 @@ static int jz_nand_correct_ecc_rs(struct mtd_info *mtd, uint8_t *dat,
        return 0;
 }
 
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-static const char *part_probes[] = {"cmdline", NULL};
-#endif
-
 static int jz_nand_ioremap_resource(struct platform_device *pdev,
        const char *name, struct resource **res, void __iomem **base)
 {
@@ -373,10 +369,7 @@ static int __devinit jz_nand_probe(struct platform_device *pdev)
                goto err_gpio_free;
        }
 
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-       num_partitions = parse_mtd_partitions(mtd, part_probes,
-                                               &partition_info, 0);
-#endif
+       num_partitions = parse_mtd_partitions(mtd, NULL, &partition_info, 0);
        if (num_partitions <= 0 && pdata) {
                num_partitions = pdata->num_partitions;
                partition_info = pdata->partitions;