diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:25:00 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:02 -0400 |
commit | 0455dfd4c8614ae971202697f6db4d239e0b44c3 (patch) | |
tree | 4452ad5334396d495dcf39bb69028aaf193fc188 /drivers/mtd/maps | |
parent | bef06150b2c0607edbee8e8c5fd7e882a90a976a (diff) |
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.c | 5 |
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, | |||
107 | spin_unlock_irqrestore(&ebu_lock, flags); | 107 | spin_unlock_irqrestore(&ebu_lock, flags); |
108 | } | 108 | } |
109 | 109 | ||
110 | static const char const *part_probe_types[] = { "cmdlinepart", NULL }; | ||
111 | |||
112 | static int __init | 110 | static int __init |
113 | ltq_mtd_probe(struct platform_device *pdev) | 111 | ltq_mtd_probe(struct platform_device *pdev) |
114 | { | 112 | { |
@@ -172,8 +170,7 @@ ltq_mtd_probe(struct platform_device *pdev) | |||
172 | cfi->addr_unlock1 ^= 1; | 170 | cfi->addr_unlock1 ^= 1; |
173 | cfi->addr_unlock2 ^= 1; | 171 | cfi->addr_unlock2 ^= 1; |
174 | 172 | ||
175 | nr_parts = parse_mtd_partitions(ltq_mtd->mtd, | 173 | nr_parts = parse_mtd_partitions(ltq_mtd->mtd, NULL, &parts, 0); |
176 | part_probe_types, &parts, 0); | ||
177 | if (nr_parts > 0) { | 174 | if (nr_parts > 0) { |
178 | dev_info(&pdev->dev, | 175 | dev_info(&pdev->dev, |
179 | "using %d partitions from cmdline", nr_parts); | 176 | "using %d partitions from cmdline", nr_parts); |