mtd: nand: socrates: 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/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 2dfb1e0d815a7492f12605f70a44b20e81199b44..925761c240ca6313d3cae61920902a423d388e4a 100644 (file)
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -30,7 +30,6 @@
 
 struct socrates_nand_host {
        struct nand_chip        nand_chip;
-       struct mtd_info         mtd;
        void __iomem            *io_base;
        struct device           *dev;
 };
@@ -159,8 +158,8 @@ static int socrates_nand_probe(struct platform_device *ofdev)
                return -EIO;
        }
 
-       mtd = &host->mtd;
        nand_chip = &host->nand_chip;
+       mtd = nand_to_mtd(nand_chip);
        host->dev = &ofdev->dev;
 
        nand_chip->priv = host;         /* link the private data structures */
@@ -216,7 +215,7 @@ out:
 static int socrates_nand_remove(struct platform_device *ofdev)
 {
        struct socrates_nand_host *host = dev_get_drvdata(&ofdev->dev);
-       struct mtd_info *mtd = &host->mtd;
+       struct mtd_info *mtd = nand_to_mtd(&host->nand_chip);
 
        nand_release(mtd);