summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:17:10 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 16:02:03 +0400
commitd845c3eebc1efea59c74a63c028f36051a4d0d8f (patch)
tree19783240de468079b50f0fd3f45bcf4188f8c6ca /drivers
parent7221eb1296b3ebb0038dabeb88fe17a4fc62e920 (diff)
downloadlinux-d845c3eebc1efea59c74a63c028f36051a4d0d8f.tar.xz
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')
-rw-r--r--drivers/mtd/nand/tmio_nand.c7
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 {
#define mtd_to_tmio(m) container_of(m, struct tmio_nand, mtd)
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-static const char *part_probes[] = { "cmdlinepart", NULL };
-#endif
/*--------------------------------------------------------------------------*/
@@ -461,9 +458,7 @@ static int tmio_probe(struct platform_device *dev)
goto err_scan;
}
/* Register the partitions */
-#ifdef CONFIG_MTD_CMDLINE_PARTS
- nbparts = parse_mtd_partitions(mtd, part_probes, &parts, 0);
-#endif
+ nbparts = parse_mtd_partitions(mtd, NULL, &parts, 0);
if (nbparts <= 0 && data) {
parts = data->partition;
nbparts = data->num_partitions;