Skip to content

Commit

Permalink
mtd: ppchameleonevb don't specify default parsing options
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent 4ac6b3e commit 16b206e
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/mtd/nand/ppchameleonevb.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ static struct mtd_partition partition_info_evb[] = {

#define NUM_PARTITIONS 1

extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, const char *mtd_id);

/*
* hardware specific access to control-lines
*/
Expand Down Expand Up @@ -187,9 +185,6 @@ static int ppchameleonevb_device_ready(struct mtd_info *minfo)
}
#endif

const char *part_probes[] = { "cmdlinepart", NULL };
const char *part_probes_evb[] = { "cmdlinepart", NULL };

/*
* Main initialization routine
*/
Expand Down Expand Up @@ -281,7 +276,7 @@ static int __init ppchameleonevb_init(void)
#endif

ppchameleon_mtd->name = "ppchameleon-nand";
mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, part_probes, &mtd_parts, 0);
mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else
Expand Down Expand Up @@ -382,7 +377,7 @@ static int __init ppchameleonevb_init(void)
}

ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;
mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, part_probes_evb, &mtd_parts, 0);
mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, NULL, &mtd_parts, 0);
if (mtd_parts_nb > 0)
part_type = "command line";
else
Expand Down

0 comments on commit 16b206e

Please sign in to comment.