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

Artem: tweaked the patch

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

index 761fb459d2c74179105fb9ded586681c66ae6aae..5d15b6b32265acc63f86c8aa4424fada2101a2eb 100644 (file)
@@ -50,7 +50,6 @@ static int rbtx4939_flash_remove(struct platform_device *dev)
 }
 
 static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
-static const char *part_probe_types[] = { "cmdlinepart", NULL };
 
 static int rbtx4939_flash_probe(struct platform_device *dev)
 {
@@ -107,9 +106,7 @@ static int rbtx4939_flash_probe(struct platform_device *dev)
        info->mtd->owner = THIS_MODULE;
        if (err)
                goto err_out;
-
-       err = parse_mtd_partitions(info->mtd, part_probe_types,
-                               &info->parts, 0);
+       err = parse_mtd_partitions(info->mtd, NULL, &info->parts, 0);
        if (err > 0) {
                mtd_device_register(info->mtd, info->parts, err);
                info->nr_parts = err;