mtd: nand: diskonchip: 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/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 5f7bcc86486ee29fde70f293a1153697db55cb75..fff7a4a69759900dbd22c67f6b480568dfb0d2c8 100644 (file)
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1556,15 +1556,15 @@ static int __init doc_probe(unsigned long physadr)
 
        printk(KERN_NOTICE "DiskOnChip found at 0x%lx\n", physadr);
 
-       len = sizeof(struct mtd_info) +
-           sizeof(struct nand_chip) + sizeof(struct doc_priv) + (2 * sizeof(struct nand_bbt_descr));
-       mtd = kzalloc(len, GFP_KERNEL);
-       if (!mtd) {
+       len = sizeof(struct nand_chip) + sizeof(struct doc_priv) +
+             (2 * sizeof(struct nand_bbt_descr));
+       nand = kzalloc(len, GFP_KERNEL);
+       if (!nand) {
                ret = -ENOMEM;
                goto fail;
        }
 
-       nand                    = (struct nand_chip *) (mtd + 1);
+       mtd                     = nand_to_mtd(nand);
        doc                     = (struct doc_priv *) (nand + 1);
        nand->bbt_td            = (struct nand_bbt_descr *) (doc + 1);
        nand->bbt_md            = nand->bbt_td + 1;
@@ -1615,7 +1615,7 @@ static int __init doc_probe(unsigned long physadr)
                   haven't yet added it.  This is handled without incident by
                   mtd_device_unregister, as far as I can tell. */
                nand_release(mtd);
-               kfree(mtd);
+               kfree(nand);
                goto fail;
        }
 
@@ -1650,7 +1650,7 @@ static void release_nanddoc(void)
                nand_release(mtd);
                iounmap(doc->virtadr);
                release_mem_region(doc->physadr, DOC_IOREMAP_LEN);
-               kfree(mtd);
+               kfree(nand);
        }
 }