OSDN Git Service

mtd: nand: mpc5121: use the mtd instance embedded in struct nand_chip
authorBoris BREZILLON <boris.brezillon@free-electrons.com>
Thu, 10 Dec 2015 08:00:11 +0000 (09:00 +0100)
committerBrian Norris <computersforpeace@gmail.com>
Fri, 18 Dec 2015 18:54:41 +0000 (10:54 -0800)
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>
drivers/mtd/nand/mpc5121_nfc.c

index 642c486..8b4cd82 100644 (file)
 #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;