diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-06-02 10:51:17 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:01:58 -0400 |
commit | 4d1220f6fa03f60a3d3995683911d29ae9c317f7 (patch) | |
tree | 39f936103971ead20d1b32b11d6e72f6cb4b1d13 /drivers/mtd/devices/m25p80.c | |
parent | 5c4eefbd5bb82a525ce5340cc8a91ab6dffeb490 (diff) |
mtd: m25p80 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.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
-rw-r--r-- | drivers/mtd/devices/m25p80.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 35180e475c4c..70d5fcacc3fd 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
@@ -968,13 +968,7 @@ static int __devinit m25p_probe(struct spi_device *spi) | |||
968 | /* partitions should match sector boundaries; and it may be good to | 968 | /* partitions should match sector boundaries; and it may be good to |
969 | * use readonly partitions for writeprotected sectors (BP2..BP0). | 969 | * use readonly partitions for writeprotected sectors (BP2..BP0). |
970 | */ | 970 | */ |
971 | if (mtd_has_cmdlinepart()) { | 971 | nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, 0); |
972 | static const char *part_probes[] | ||
973 | = { "cmdlinepart", NULL, }; | ||
974 | |||
975 | nr_parts = parse_mtd_partitions(&flash->mtd, | ||
976 | part_probes, &parts, 0); | ||
977 | } | ||
978 | 972 | ||
979 | if (nr_parts <= 0 && data && data->parts) { | 973 | if (nr_parts <= 0 && data && data->parts) { |
980 | parts = data->parts; | 974 | parts = data->parts; |