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

mtd: mpc5121_nfc 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 ac9b0f36

drivers/mtd/nand/mpc5121_nfc.c

+1 −3
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ struct mpc5121_nfc_prv { 


static void mpc5121_nfc_done(struct mtd_info *mtd);



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



/* Read NFC register */

static inline u16 nfc_read(struct mtd_info *mtd, uint reg)

{
@@ -838,7 +836,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op) 
	dev_set_drvdata(dev, mtd);



	/* Register device in MTD */

	retval = parse_mtd_partitions(mtd, mpc5121_nfc_pprobes, &parts, 0);

	retval = parse_mtd_partitions(mtd, NULL, &parts, 0);

#ifdef CONFIG_MTD_OF_PARTS

	if (retval == 0)

		retval = of_mtd_parse_partitions(dev, dn, &parts);