Skip to content

Commit

Permalink
mtd: mpc5121_nfc don't specify default parsing options
Browse files Browse the repository at this point in the history
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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
  • Loading branch information
Dmitry Eremin-Solenikov authored and Artem Bityutskiy committed Sep 11, 2011
1 parent ac9b0f3 commit 5279fe3
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/mtd/nand/mpc5121_nfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 5279fe3

Please sign in to comment.