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

mtd: m25p80 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 5c4eefbd
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -968,13 +968,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
	/* partitions should match sector boundaries; and it may be good to
	 * use readonly partitions for writeprotected sectors (BP2..BP0).
	 */
	if (mtd_has_cmdlinepart()) {
		static const char *part_probes[]
			= { "cmdlinepart", NULL, };

		nr_parts = parse_mtd_partitions(&flash->mtd,
						part_probes, &parts, 0);
	}
	nr_parts = parse_mtd_partitions(&flash->mtd, NULL, &parts, 0);

	if (nr_parts <= 0 && data && data->parts) {
		parts = data->parts;