]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mtd: davinci_nand don't specify default parsing options
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sun, 29 May 2011 16:16:54 +0000 (20:16 +0400)
committerArtem Bityutskiy <dedekind1@gmail.com>
Thu, 23 Jun 2011 08:43:38 +0000 (11:43 +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/davinci_nand.c

index a4c82b4344baa88b947992a122a8e48705848484..0c582ed98e4309f9e163cb4436a7c6ed931a980f 100644 (file)
@@ -753,14 +753,7 @@ syndrome_done:
        if (ret < 0)
                goto err_scan;
 
-       if (mtd_has_cmdlinepart()) {
-               static const char *probes[] __initconst = {
-                       "cmdlinepart", NULL
-               };
-
-               mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes,
-                                                   &mtd_parts, 0);
-       }
+       mtd_parts_nb = parse_mtd_partitions(&info->mtd, NULL, &mtd_parts, 0);
 
        if (mtd_parts_nb <= 0) {
                mtd_parts = pdata->parts;