diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-05-29 12:17:10 -0400 |
---|---|---|
committer | Artem Bityutskiy <artem.bityutskiy@intel.com> | 2011-09-11 08:02:03 -0400 |
commit | d845c3eebc1efea59c74a63c028f36051a4d0d8f (patch) | |
tree | 19783240de468079b50f0fd3f45bcf4188f8c6ca /drivers/mtd | |
parent | 7221eb1296b3ebb0038dabeb88fe17a4fc62e920 (diff) |
mtd: tmio_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>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/tmio_nand.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c index 11e8371b5683..b6ffad64cda5 100644 --- a/drivers/mtd/nand/tmio_nand.c +++ b/drivers/mtd/nand/tmio_nand.c | |||
@@ -121,9 +121,6 @@ struct tmio_nand { | |||
121 | 121 | ||
122 | #define mtd_to_tmio(m) container_of(m, struct tmio_nand, mtd) | 122 | #define mtd_to_tmio(m) container_of(m, struct tmio_nand, mtd) |
123 | 123 | ||
124 | #ifdef CONFIG_MTD_CMDLINE_PARTS | ||
125 | static const char *part_probes[] = { "cmdlinepart", NULL }; | ||
126 | #endif | ||
127 | 124 | ||
128 | /*--------------------------------------------------------------------------*/ | 125 | /*--------------------------------------------------------------------------*/ |
129 | 126 | ||
@@ -461,9 +458,7 @@ static int tmio_probe(struct platform_device *dev) | |||
461 | goto err_scan; | 458 | goto err_scan; |
462 | } | 459 | } |
463 | /* Register the partitions */ | 460 | /* Register the partitions */ |
464 | #ifdef CONFIG_MTD_CMDLINE_PARTS | 461 | nbparts = parse_mtd_partitions(mtd, NULL, &parts, 0); |
465 | nbparts = parse_mtd_partitions(mtd, part_probes, &parts, 0); | ||
466 | #endif | ||
467 | if (nbparts <= 0 && data) { | 462 | if (nbparts <= 0 && data) { |
468 | parts = data->partition; | 463 | parts = data->partition; |
469 | nbparts = data->num_partitions; | 464 | nbparts = data->num_partitions; |