Skip to content

Commit

Permalink
mtd: m25p80 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 5c4eefb commit 4d1220f
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/mtd/devices/m25p80.c
Original file line number Diff line number Diff line change
Expand Up @@ -968,13 +968,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
/* partitions should match sector boundaries; and it may be good to
* use readonly partitions for writeprotected sectors (BP2..BP0).
*/
if (mtd_has_cmdlinepart()) {
static const char *part_probes[]
= { "cmdlinepart", NULL, };

nr_parts = parse_mtd_partitions(&flash->mtd,
part_probes, &parts, 0);
}
nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, 0);

if (nr_parts <= 0 && data && data->parts) {
parts = data->parts;
Expand Down

0 comments on commit 4d1220f

Please sign in to comment.