]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mtd: m25p80 don't specify default parsing options
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Thu, 2 Jun 2011 14:51:17 +0000 (18:51 +0400)
committerArtem Bityutskiy <dedekind1@gmail.com>
Thu, 23 Jun 2011 08:43:35 +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/devices/m25p80.c

index 35180e475c4c565fded31dc91d6fe05c91aec805..70d5fcacc3fd95cb45a1cfd03456def540a47eda 100644 (file)
@@ -968,13 +968,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
        /* partitions should match sector boundaries; and it may be good to
         * use readonly partitions for writeprotected sectors (BP2..BP0).
         */
-       if (mtd_has_cmdlinepart()) {
-               static const char *part_probes[]
-                       = { "cmdlinepart", NULL, };
-
-               nr_parts = parse_mtd_partitions(&flash->mtd,
-                                               part_probes, &parts, 0);
-       }
+       nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, 0);
 
        if (nr_parts <= 0 && data && data->parts) {
                parts = data->parts;