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

mtd: cmx270_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 caf32f4e

drivers/mtd/nand/cmx270_nand.c

+2 −5
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ static struct mtd_partition partition_info[] = { 
};

#define NUM_PARTITIONS (ARRAY_SIZE(partition_info))



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



static u_char cmx270_read_byte(struct mtd_info *mtd)

{

	struct nand_chip *this = mtd->priv;
@@ -222,14 +220,13 @@ static int __init cmx270_init(void) 
		goto err_scan;

	}



#ifdef CONFIG_MTD_CMDLINE_PARTS

	mtd_parts_nb = parse_mtd_partitions(cmx270_nand_mtd, part_probes,

	mtd_parts_nb = parse_mtd_partitions(cmx270_nand_mtd, NULL,

					    &mtd_parts, 0);

	if (mtd_parts_nb > 0)

		part_type = "command line";

	else

		mtd_parts_nb = 0;

#endif



	if (!mtd_parts_nb) {

		mtd_parts = partition_info;

		mtd_parts_nb = NUM_PARTITIONS;