mtd: nand: ndfc: 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/ndfc.c b/drivers/mtd/nand/ndfc.c
index d8a23b052d501cd217e4bdaad21cf36d927d5f3f..3a7168e5200723c8d769b3e77218456385612b56 100644 (file)
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -37,7 +37,6 @@
 struct ndfc_controller {
        struct platform_device *ofdev;
        void __iomem *ndfcbase;
-       struct mtd_info mtd;
        struct nand_chip chip;
        int chip_select;
        struct nand_hw_control ndfc_control;
@@ -147,6 +146,7 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
 {
        struct device_node *flash_np;
        struct nand_chip *chip = &ndfc->chip;
+       struct mtd_info *mtd = nand_to_mtd(chip);
        int ret;
 
        chip->IO_ADDR_R = ndfc->ndfcbase + NDFC_DATA;
@@ -167,31 +167,32 @@ static int ndfc_chip_init(struct ndfc_controller *ndfc,
        chip->ecc.strength = 1;
        chip->priv = ndfc;
 
-       ndfc->mtd.priv = chip;
-       ndfc->mtd.dev.parent = &ndfc->ofdev->dev;
+       mtd->priv = chip;
+       mtd->dev.parent = &ndfc->ofdev->dev;
 
        flash_np = of_get_next_child(node, NULL);
        if (!flash_np)
                return -ENODEV;
        nand_set_flash_node(chip, flash_np);
 
-       ndfc->mtd.name = kasprintf(GFP_KERNEL, "%s.%s",
-                       dev_name(&ndfc->ofdev->dev), flash_np->name);
-       if (!ndfc->mtd.name) {
+       ppdata.of_node = flash_np;
+       mtd->name = kasprintf(GFP_KERNEL, "%s.%s", dev_name(&ndfc->ofdev->dev),
+                             flash_np->name);
+       if (!mtd->name) {
                ret = -ENOMEM;
                goto err;
        }
 
-       ret = nand_scan(&ndfc->mtd, 1);
+       ret = nand_scan(mtd, 1);
        if (ret)
                goto err;
 
-       ret = mtd_device_register(&ndfc->mtd, NULL, 0);
+       ret = mtd_device_register(mtd, NULL, 0);
 
 err:
        of_node_put(flash_np);
        if (ret)
-               kfree(ndfc->mtd.name);
+               kfree(mtd->name);
        return ret;
 }
 
@@ -258,9 +259,10 @@ static int ndfc_probe(struct platform_device *ofdev)
 static int ndfc_remove(struct platform_device *ofdev)
 {
        struct ndfc_controller *ndfc = dev_get_drvdata(&ofdev->dev);
+       struct mtd_info *mtd = nand_to_mtd(&ndfc->chip);
 
-       nand_release(&ndfc->mtd);
-       kfree(ndfc->mtd.name);
+       nand_release(mtd);
+       kfree(mtd->name);
 
        return 0;
 }