mtd: pxa3xx_nand don't specify default parsing options
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sun, 29 May 2011 16:17:06 +0000 (20:17 +0400)
committerArtem Bityutskiy <artem.bityutskiy@intel.com>
Sun, 11 Sep 2011 12:02:03 +0000 (15:02 +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/pxa3xx_nand.c

index e11f926c9335ce4ad2879dd3feff875438f73cda..c7da3c8be9d67ffbb84e53837369e4fb701bbe6a 100644 (file)
@@ -1129,6 +1129,8 @@ 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) {
@@ -1146,16 +1148,11 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       if (mtd_has_cmdlinepart()) {
-               const char *probes[] = { "cmdlinepart", NULL };
-               struct mtd_partition *parts;
-               int nr_parts;
 
-               nr_parts = parse_mtd_partitions(info->mtd, probes, &parts, 0);
+       nr_parts = parse_mtd_partitions(info->mtd, NULL, &parts, 0);
 
-               if (nr_parts)
-                       return mtd_device_register(info->mtd, parts, nr_parts);
-       }
+       if (nr_parts)
+               return mtd_device_register(info->mtd, parts, nr_parts);
 
        return mtd_device_register(info->mtd, pdata->parts, pdata->nr_parts);
 }