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

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

mtd: nand: ams-delta: use the mtd instance embedded in struct nand_chip 



struct nand_chip now embeds an mtd device. Make use of this mtd instance
instead of allocating our own.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 4578ea9a

drivers/mtd/nand/ams-delta.c

+5 −8
Original line number Diff line number Diff line
@@ -183,19 +183,16 @@ static int ams_delta_init(struct platform_device *pdev) 
		return -ENXIO;



	/* Allocate memory for MTD device structure and private data */

	ams_delta_mtd = kzalloc(sizeof(struct mtd_info) +

				sizeof(struct nand_chip), GFP_KERNEL);

	if (!ams_delta_mtd) {

	this = kzalloc(sizeof(struct nand_chip), GFP_KERNEL);

	if (!this) {

		printk (KERN_WARNING "Unable to allocate E3 NAND MTD device structure.\n");

		err = -ENOMEM;

		goto out;

	}



	ams_delta_mtd = nand_to_mtd(this);

	ams_delta_mtd->owner = THIS_MODULE;



	/* Get pointer to private data */

	this = (struct nand_chip *) (&ams_delta_mtd[1]);



	/* Link the private data with the MTD structure */

	ams_delta_mtd->priv = this;
@@ -256,7 +253,7 @@ static int ams_delta_init(struct platform_device *pdev) 
	gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);

	iounmap(io_base);

out_free:

	kfree(ams_delta_mtd);

	kfree(this);

 out:

	return err;

}
@@ -276,7 +273,7 @@ static int ams_delta_cleanup(struct platform_device *pdev) 
	iounmap(io_base);



	/* Free the MTD device structure */

	kfree(ams_delta_mtd);

	kfree(mtd_to_nand(ams_delta_mtd));



	return 0;

}