diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:16:42 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:01:59 -0400 |
commit | 1fc468d5d55a0d9101e482ccb96b1b2879a73882 (patch) | |
tree | 46df1c5ccefb1b34b0af83b313777797b45dc236 /drivers/mtd/devices | |
parent | 1676bc18c6648c378029dad365756e12be7da025 (diff) |
mtd: mtd_dataflash 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')
-rw-r--r-- | drivers/mtd/devices/mtd_dataflash.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 13749d458a31..4d4a9cd10c33 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c | |||
@@ -677,12 +677,7 @@ add_dataflash_otp(struct spi_device *spi, char *name, | |||
677 | pagesize, otp_tag); | 677 | pagesize, otp_tag); |
678 | dev_set_drvdata(&spi->dev, priv); | 678 | dev_set_drvdata(&spi->dev, priv); |
679 | 679 | ||
680 | if (mtd_has_cmdlinepart()) { | 680 | nr_parts = parse_mtd_partitions(device, NULL, &parts, 0); |
681 | static const char *part_probes[] = { "cmdlinepart", NULL, }; | ||
682 | |||
683 | nr_parts = parse_mtd_partitions(device, part_probes, &parts, | ||
684 | 0); | ||
685 | } | ||
686 | 681 | ||
687 | if (nr_parts <= 0 && pdata && pdata->parts) { | 682 | if (nr_parts <= 0 && pdata && pdata->parts) { |
688 | parts = pdata->parts; | 683 | parts = pdata->parts; |