aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/mpc5121_nfc.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-05-29 12:17:01 -0400
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-09-11 08:02:02 -0400
commit5279fe36fa4c5e3f33b25111c1cbf08386e78d06 (patch)
tree5c6c8dcca29aa22ce102acc9a77a94f95f7bc7e1 /drivers/mtd/nand/mpc5121_nfc.c
parentac9b0f3662f523e6aeb7669b40269ecbd2fd752b (diff)
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: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'drivers/mtd/nand/mpc5121_nfc.c')
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 2f2c35a7771e..30f78ea8e993 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -131,8 +131,6 @@ struct mpc5121_nfc_prv {
131 131
132static void mpc5121_nfc_done(struct mtd_info *mtd); 132static void mpc5121_nfc_done(struct mtd_info *mtd);
133 133
134static const char *mpc5121_nfc_pprobes[] = { "cmdlinepart", NULL };
135
136/* Read NFC register */ 134/* Read NFC register */
137static inline u16 nfc_read(struct mtd_info *mtd, uint reg) 135static inline u16 nfc_read(struct mtd_info *mtd, uint reg)
138{ 136{
@@ -838,7 +836,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
838 dev_set_drvdata(dev, mtd); 836 dev_set_drvdata(dev, mtd);
839 837
840 /* Register device in MTD */ 838 /* Register device in MTD */
841 retval = parse_mtd_partitions(mtd, mpc5121_nfc_pprobes, &parts, 0); 839 retval = parse_mtd_partitions(mtd, NULL, &parts, 0);
842#ifdef CONFIG_MTD_OF_PARTS 840#ifdef CONFIG_MTD_OF_PARTS
843 if (retval == 0) 841 if (retval == 0)
844 retval = of_mtd_parse_partitions(dev, dn, &parts); 842 retval = of_mtd_parse_partitions(dev, dn, &parts);