aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 12:16:58 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:02 -0400
commite411f52d591fff47a251a213e1f4115dfb356e8d (patch)
treefa4001b863f60c238b98e2188d58d51c3bf19aa3
parent8d3f8bb8093080d4e2b1de096af444b694a16766 (diff)
mtd: h1910 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/h1910.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 02a03e67109c..42f9177e36b1 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -136,14 +136,10 @@ static int __init h1910_init(void)
136 iounmap((void *)nandaddr); 136 iounmap((void *)nandaddr);
137 return -ENXIO; 137 return -ENXIO;
138 } 138 }
139#ifdef CONFIG_MTD_CMDLINE_PARTS 139 mtd_parts_nb = parse_mtd_partitions(h1910_nand_mtd, NULL, &mtd_parts, 0);
140 mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts, "h1910-nand");
141 if (mtd_parts_nb > 0) 140 if (mtd_parts_nb > 0)
142 part_type = "command line"; 141 part_type = "command line";
143 else 142 else {
144 mtd_parts_nb = 0;
145#endif
146 if (mtd_parts_nb == 0) {
147 mtd_parts = partition_info; 143 mtd_parts = partition_info;
148 mtd_parts_nb = NUM_PARTITIONS; 144 mtd_parts_nb = NUM_PARTITIONS;
149 part_type = "static"; 145 part_type = "static";