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

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

drivers/mtd/nand/tmio_nand.c

+1 −6
Original line number Diff line number Diff line
@@ -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;