summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 18:25:00 +0200
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 14:02:02 +0200
commit0455dfd4c8614ae971202697f6db4d239e0b44c3 (patch)
tree4452ad5334396d495dcf39bb69028aaf193fc188 /drivers/mtd/maps
parentmtd: jz4740_nand don't specify default parsing options (diff)
downloadlinux-0455dfd4c8614ae971202697f6db4d239e0b44c3.tar.xz
linux-0455dfd4c8614ae971202697f6db4d239e0b44c3.zip
mtd: lantiq-flash don't specify default parsing options
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: tewaked the patch Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/lantiq-flash.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index a90cabd7b84d..57ea3fe2296f 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -107,8 +107,6 @@ ltq_copy_to(struct map_info *map, unsigned long to,
spin_unlock_irqrestore(&ebu_lock, flags);
}
-static const char const *part_probe_types[] = { "cmdlinepart", NULL };
-
static int __init
ltq_mtd_probe(struct platform_device *pdev)
{
@@ -172,8 +170,7 @@ ltq_mtd_probe(struct platform_device *pdev)
cfi->addr_unlock1 ^= 1;
cfi->addr_unlock2 ^= 1;
- nr_parts = parse_mtd_partitions(ltq_mtd->mtd,
- part_probe_types, &parts, 0);
+ nr_parts = parse_mtd_partitions(ltq_mtd->mtd, NULL, &parts, 0);
if (nr_parts > 0) {
dev_info(&pdev->dev,
"using %d partitions from cmdline", nr_parts);