summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 20:16:56 +0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 15:02:01 +0300
commita8e083246387ffb9a84551fa908a358cacdc2b0c (patch)
tree640a7f291809ef74d3463977d861c6f1a4dcbadc
parent495e2f41c38c99b2785cd3d99b24b080b20e8eb4 (diff)
mtd: fsl_upm 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/fsl_upm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 23752fd5bc5..7c782ebd0f3 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -158,7 +158,6 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
{
int ret;
struct device_node *flash_np;
- static const char *part_types[] = { "cmdlinepart", NULL, };
fun->chip.IO_ADDR_R = fun->io_base;
fun->chip.IO_ADDR_W = fun->io_base;
@@ -192,7 +191,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
if (ret)
goto err;
- ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0);
+ ret = parse_mtd_partitions(&fun->mtd, NULL, &fun->parts, 0);
#ifdef CONFIG_MTD_OF_PARTS
if (ret == 0) {