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

mtd: sharpsl 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 5b2efbdf

drivers/mtd/nand/sharpsl.c

+1 −3
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat, 
	return readb(sharpsl->io + ECCCNTR) != 0;

}



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



/*

 * Main initialization routine

 */
@@ -184,7 +182,7 @@ static int __devinit sharpsl_nand_probe(struct platform_device *pdev) 


	/* Register the partitions */

	sharpsl->mtd.name = "sharpsl-nand";

	nr_partitions = parse_mtd_partitions(&sharpsl->mtd, part_probes, &sharpsl_partition_info, 0);

	nr_partitions = parse_mtd_partitions(&sharpsl->mtd, NULL, &sharpsl_partition_info, 0);

	if (nr_partitions <= 0) {

		nr_partitions = data->nr_partitions;

		sharpsl_partition_info = data->partitions;