Commit 248f56d3 authored by Jamie Iles's avatar Jamie Iles Committed by David Woodhouse

mtd: mpc5121_nfc: convert to mtd_device_register()

Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.
Signed-off-by: default avatarJamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 85358b2a
...@@ -131,9 +131,7 @@ struct mpc5121_nfc_prv { ...@@ -131,9 +131,7 @@ struct mpc5121_nfc_prv {
static void mpc5121_nfc_done(struct mtd_info *mtd); static void mpc5121_nfc_done(struct mtd_info *mtd);
#ifdef CONFIG_MTD_PARTITIONS
static const char *mpc5121_nfc_pprobes[] = { "cmdlinepart", NULL }; static const char *mpc5121_nfc_pprobes[] = { "cmdlinepart", NULL };
#endif
/* 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)
...@@ -658,9 +656,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op) ...@@ -658,9 +656,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
struct mpc5121_nfc_prv *prv; struct mpc5121_nfc_prv *prv;
struct resource res; struct resource res;
struct mtd_info *mtd; struct mtd_info *mtd;
#ifdef CONFIG_MTD_PARTITIONS
struct mtd_partition *parts; struct mtd_partition *parts;
#endif
struct nand_chip *chip; struct nand_chip *chip;
unsigned long regs_paddr, regs_size; unsigned long regs_paddr, regs_size;
const __be32 *chips_no; const __be32 *chips_no;
...@@ -841,7 +837,6 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op) ...@@ -841,7 +837,6 @@ 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 */
#ifdef CONFIG_MTD_PARTITIONS
retval = parse_mtd_partitions(mtd, mpc5121_nfc_pprobes, &parts, 0); retval = parse_mtd_partitions(mtd, mpc5121_nfc_pprobes, &parts, 0);
#ifdef CONFIG_MTD_OF_PARTS #ifdef CONFIG_MTD_OF_PARTS
if (retval == 0) if (retval == 0)
...@@ -854,12 +849,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op) ...@@ -854,12 +849,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
goto error; goto error;
} }
if (retval > 0) retval = mtd_device_register(mtd, parts, retval);
retval = add_mtd_partitions(mtd, parts, retval);
else
#endif
retval = add_mtd_device(mtd);
if (retval) { if (retval) {
dev_err(dev, "Error adding MTD device!\n"); dev_err(dev, "Error adding MTD device!\n");
devm_free_irq(dev, prv->irq, mtd); devm_free_irq(dev, prv->irq, mtd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment