summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris BREZILLON2015-12-10 09:00:11 +0100
committerBrian Norris2015-12-18 19:54:41 +0100
commit5a9f23ffb6da3a6141ab58aeeb7470e0ec69f2ff (patch)
treed83cbb15f5cd2f468b304b66420df3de11cc0f7e
parentmtd: nand: lpc32xx: use the mtd instance embedded in struct nand_chip (diff)
downloadkernel-qcow2-linux-5a9f23ffb6da3a6141ab58aeeb7470e0ec69f2ff.tar.gz
kernel-qcow2-linux-5a9f23ffb6da3a6141ab58aeeb7470e0ec69f2ff.tar.xz
kernel-qcow2-linux-5a9f23ffb6da3a6141ab58aeeb7470e0ec69f2ff.zip
mtd: nand: mpc5121: use the mtd instance embedded in struct nand_chip
struct nand_chip now embeds an mtd device. Make use of this mtd instance. Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--drivers/mtd/nand/mpc5121_nfc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 642c486ea3c2..8b4cd82f019e 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -118,7 +118,6 @@
#define NFC_TIMEOUT (HZ / 10) /* 1/10 s */
struct mpc5121_nfc_prv {
- struct mtd_info mtd;
struct nand_chip chip;
int irq;
void __iomem *regs;
@@ -654,8 +653,8 @@ static int mpc5121_nfc_probe(struct platform_device *op)
if (!prv)
return -ENOMEM;
- mtd = &prv->mtd;
chip = &prv->chip;
+ mtd = nand_to_mtd(chip);
mtd->priv = chip;
mtd->dev.parent = dev;