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

mtd: atmel_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.

Artem: tweaked the patch

Signed-off-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 2ef3855a

drivers/mtd/nand/atmel_nand.c

+1 −8
Original line number Diff line number Diff line
@@ -481,10 +481,6 @@ static void atmel_nand_hwctl(struct mtd_info *mtd, int mode) 
	}

}



#ifdef CONFIG_MTD_CMDLINE_PARTS

static const char *part_probes[] = { "cmdlinepart", NULL };

#endif



/*

 * Probe for the NAND device.

 */
@@ -655,11 +651,8 @@ static int __init atmel_nand_probe(struct platform_device *pdev) 
		goto err_scan_tail;

	}



#ifdef CONFIG_MTD_CMDLINE_PARTS

	mtd->name = "atmel_nand";

	num_partitions = parse_mtd_partitions(mtd, part_probes,

					      &partitions, 0);

#endif

	num_partitions = parse_mtd_partitions(mtd, NULL, &partitions, 0);

	if (num_partitions <= 0 && host->board->parts) {

		partitions = host->board->parts;

		num_partitions = host->board->num_parts;