Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 04:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: mpc5121_nfc don't specify default parsing options

Browse Source 
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>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-05-29 20:17:01 +04:00 committed by Artem Bityutskiy
parent ac9b0f3662
commit 5279fe36fa
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/nand/mpc5121_nfc.c
View File

@ -131,8 +131,6 @@ struct mpc5121_nfc_prv {
static void mpc5121_nfc_done(struct mtd_info *mtd); static void mpc5121_nfc_done(struct mtd_info *mtd);
static const char *mpc5121_nfc_pprobes[] = { "cmdlinepart", NULL };
/* Read NFC register */ /* Read NFC register */
static inline u16 nfc_read(struct mtd_info *mtd, uint reg) 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); dev_set_drvdata(dev, mtd);
/* Register device in 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 #ifdef CONFIG_MTD_OF_PARTS
if (retval == 0) if (retval == 0)
retval = of_mtd_parse_partitions(dev, dn, &parts); retval = of_mtd_parse_partitions(dev, dn, &parts);