struct nand_chip now embeds an mtd device. Make use of this mtd instance.

Signed-off-by: Boris Brezillon <boris.brezil...@free-electrons.com>
---
Changes generated with the following coccinelle script

--->8---
virtual patch

@fix1@
identifier __chipfield, __mtdfield;
type __type;
@@
(
        __type {
                ...
                struct nand_chip __chipfield;
                ...
-               struct mtd_info __mtdfield;
                ...
        };
|
        __type {
                ...
-               struct mtd_info __mtdfield;
                ...
                struct nand_chip __chipfield;
                ...
        };
)

@fix2 depends on fix1@
identifier fix1.__chipfield, fix1.__mtdfield;
identifier __subfield;
type fix1.__type;
__type *__priv;
@@
(
-       __priv->__mtdfield.__subfield
+       nand_to_mtd(&__priv->__chipfield)->__subfield
|
-       &(__priv->__mtdfield)
+       nand_to_mtd(&__priv->__chipfield)
)
--->8---
---
 drivers/mtd/nand/mpc5121_nfc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 642c486..8b4cd82 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;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to