Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0c423c7 authored by Boris Brezillon's avatar Boris Brezillon Committed by Brian Norris
Browse files

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: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent a5cfb4db

drivers/mtd/nand/diskonchip.c

+7 −7
Original line number Diff line number Diff line
@@ -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);

	}

}