Commit a8e08324 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Artem Bityutskiy
Browse files

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: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 495e2f41

drivers/mtd/nand/fsl_upm.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {