aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/ppchameleonevb.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 12:17:05 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:03 -0400
commit16b206e62f9b43ba864571a6808844aaddea7479 (patch)
tree0bf1d0b16dd50d1db913ec2c2820872fce7b776c /drivers/mtd/nand/ppchameleonevb.c
parent4ac6b3ef7191c508a356c205b02ab82f5e228d0c (diff)
mtd: ppchameleonevb 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/nand/ppchameleonevb.c')
-rw-r--r--drivers/mtd/nand/ppchameleonevb.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c
index 3bbb796b451c..93766336ab79 100644
--- a/drivers/mtd/nand/ppchameleonevb.c
+++ b/drivers/mtd/nand/ppchameleonevb.c
@@ -99,8 +99,6 @@ static struct mtd_partition partition_info_evb[] = {
99 99
100#define NUM_PARTITIONS 1 100#define NUM_PARTITIONS 1
101 101
102extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, const char *mtd_id);
103
104/* 102/*
105 * hardware specific access to control-lines 103 * hardware specific access to control-lines
106 */ 104 */
@@ -187,9 +185,6 @@ static int ppchameleonevb_device_ready(struct mtd_info *minfo)
187} 185}
188#endif 186#endif
189 187
190const char *part_probes[] = { "cmdlinepart", NULL };
191const char *part_probes_evb[] = { "cmdlinepart", NULL };
192
193/* 188/*
194 * Main initialization routine 189 * Main initialization routine
195 */ 190 */
@@ -281,7 +276,7 @@ static int __init ppchameleonevb_init(void)
281#endif 276#endif
282 277
283 ppchameleon_mtd->name = "ppchameleon-nand"; 278 ppchameleon_mtd->name = "ppchameleon-nand";
284 mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, part_probes, &mtd_parts, 0); 279 mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, NULL, &mtd_parts, 0);
285 if (mtd_parts_nb > 0) 280 if (mtd_parts_nb > 0)
286 part_type = "command line"; 281 part_type = "command line";
287 else 282 else
@@ -382,7 +377,7 @@ static int __init ppchameleonevb_init(void)
382 } 377 }
383 378
384 ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME; 379 ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;
385 mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, part_probes_evb, &mtd_parts, 0); 380 mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, NULL, &mtd_parts, 0);
386 if (mtd_parts_nb > 0) 381 if (mtd_parts_nb > 0)
387 part_type = "command line"; 382 part_type = "command line";
388 else 383 else