summaryrefslogtreecommitdiff
path: root/drivers/mtd/nand/socrates_nand.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:17:09 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:03 +0300
commit7221eb1296b3ebb0038dabeb88fe17a4fc62e920 (patch)
tree23398e2f67728d1d8f6d2cdd8167eb997cb873e7 /drivers/mtd/nand/socrates_nand.c
parenta4c93614fded8ef0be90fca6a619d3c9c3e9552f (diff)
mtd: socrates_nand 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: tweaked 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/nand/socrates_nand.c')
-rw-r--r--drivers/mtd/nand/socrates_nand.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index ca2d0555729e..9023ac833fcf 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -155,8 +155,6 @@ static int socrates_nand_device_ready(struct mtd_info *mtd)
return 1;
}
-static const char *part_probes[] = { "cmdlinepart", NULL };
-
/*
* Probe for the NAND device.
*/
@@ -225,14 +223,11 @@ static int __devinit socrates_nand_probe(struct platform_device *ofdev)
goto out;
}
-#ifdef CONFIG_MTD_CMDLINE_PARTS
- num_partitions = parse_mtd_partitions(mtd, part_probes,
- &partitions, 0);
+ num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0);
if (num_partitions < 0) {
res = num_partitions;
goto release;
}
-#endif
if (num_partitions == 0) {
num_partitions = of_mtd_parse_partitions(&ofdev->dev,