summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:16:42 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:01:59 +0300
commit1fc468d5d55a0d9101e482ccb96b1b2879a73882 (patch)
tree46df1c5ccefb1b34b0af83b313777797b45dc236
parent1676bc18c6648c378029dad365756e12be7da025 (diff)
downloadlinux-1fc468d5d55a0d9101e482ccb96b1b2879a73882.tar.gz
linux-1fc468d5d55a0d9101e482ccb96b1b2879a73882.tar.bz2
linux-1fc468d5d55a0d9101e482ccb96b1b2879a73882.zip
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>
-rw-r--r--drivers/mtd/devices/mtd_dataflash.c7
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,
pagesize, otp_tag);
dev_set_drvdata(&spi->dev, priv);
- if (mtd_has_cmdlinepart()) {
- static const char *part_probes[] = { "cmdlinepart", NULL, };
-
- nr_parts = parse_mtd_partitions(device, part_probes, &parts,
- 0);
- }
+ nr_parts = parse_mtd_partitions(device, NULL, &parts, 0);
if (nr_parts <= 0 && pdata && pdata->parts) {
parts = pdata->parts;