mtd: nand: mxc: 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>

diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index b291258bfe7b2147b2f6b7298b7352535d2589fb..9dd71af363c3602f4d5b2415622b06660a274ba0 100644 (file)
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -173,7 +173,6 @@ struct mxc_nand_devtype_data {
 };
 
 struct mxc_nand_host {
-       struct mtd_info         mtd;
        struct nand_chip        nand;
        struct device           *dev;
 
@@ -1514,7 +1513,7 @@ static int mxcnd_probe(struct platform_device *pdev)
        host->dev = &pdev->dev;
        /* structures must be linked */
        this = &host->nand;
-       mtd = &host->mtd;
+       mtd = nand_to_mtd(this);
        mtd->priv = this;
        mtd->dev.parent = &pdev->dev;
        mtd->name = DRIVER_NAME;
@@ -1702,7 +1701,7 @@ static int mxcnd_remove(struct platform_device *pdev)
 {
        struct mxc_nand_host *host = platform_get_drvdata(pdev);
 
-       nand_release(&host->mtd);
+       nand_release(nand_to_mtd(&host->nand));
        if (host->clk_act)
                clk_disable_unprepare(host->clk);