summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 18:17:02 +0200
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 14:02:03 +0200
commit2aedf3e982c1b0177710c87e2f199624d07abc8e (patch)
tree498050603107fd97c78179825d24fa281d5548c5
parentmtd: mpc5121_nfc don't specify default parsing options (diff)
downloadlinux-2aedf3e982c1b0177710c87e2f199624d07abc8e.tar.xz
linux-2aedf3e982c1b0177710c87e2f199624d07abc8e.zip
mtd: ndfc 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>
-rw-r--r--drivers/mtd/nand/ndfc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index ea2dea8a9c88..cb66fd79f1fa 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -159,11 +159,6 @@ static int ndfc_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
static int ndfc_chip_init(struct ndfc_controller *ndfc,
struct device_node *node)
{
-#ifdef CONFIG_MTD_CMDLINE_PARTS
- static const char *part_types[] = { "cmdlinepart", NULL };
-#else
- static const char *part_types[] = { NULL };
-#endif
struct device_node *flash_np;
struct nand_chip *chip = &ndfc->chip;
int ret;
@@ -204,7 +199,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
if (ret)
goto err;
- ret = parse_mtd_partitions(&ndfc->mtd, part_types, &ndfc->parts, 0);
+ ret = parse_mtd_partitions(&ndfc->mtd, NULL, &ndfc->parts, 0);
if (ret < 0)
goto err;