summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:16:54 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:01 +0300
commit4e243a04c39b009e42ff4a4682ed47b850997dc1 (patch)
tree7181c3fc10c9509066958d85d4bcfd760ad6ef02
parent5987d3f45a3819985eb8f34203a5ca2604f08c06 (diff)
downloadlinux-stable-4e243a04c39b009e42ff4a4682ed47b850997dc1.tar.gz
linux-stable-4e243a04c39b009e42ff4a4682ed47b850997dc1.tar.bz2
linux-stable-4e243a04c39b009e42ff4a4682ed47b850997dc1.zip
mtd: davinci_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. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/nand/davinci_nand.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index a4c82b4344ba..0c582ed98e43 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -753,14 +753,7 @@ syndrome_done:
if (ret < 0)
goto err_scan;
- if (mtd_has_cmdlinepart()) {
- static const char *probes[] __initconst = {
- "cmdlinepart", NULL
- };
-
- mtd_parts_nb = parse_mtd_partitions(&info->mtd, probes,
- &mtd_parts, 0);
- }
+ mtd_parts_nb = parse_mtd_partitions(&info->mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb <= 0) {
mtd_parts = pdata->parts;