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

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

mtd: nand: plat: 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 4e3b6d17

drivers/mtd/nand/plat_nand.c

+8 −7
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


struct plat_nand_data {

	struct nand_chip	chip;

	struct mtd_info		mtd;

	void __iomem		*io_base;

};
@@ -31,6 +30,7 @@ static int plat_nand_probe(struct platform_device *pdev) 
{

	struct platform_nand_data *pdata = dev_get_platdata(&pdev->dev);

	struct plat_nand_data *data;

	struct mtd_info *mtd;

	struct resource *res;

	const char **part_types;

	int err = 0;
@@ -58,8 +58,9 @@ static int plat_nand_probe(struct platform_device *pdev) 


	data->chip.priv = &data;

	nand_set_flash_node(&data->chip, pdev->dev.of_node);

	data->mtd.priv = &data->chip;

	data->mtd.dev.parent = &pdev->dev;

	mtd = nand_to_mtd(&data->chip);

	mtd->priv = &data->chip;

	mtd->dev.parent = &pdev->dev;



	data->chip.IO_ADDR_R = data->io_base;

	data->chip.IO_ADDR_W = data->io_base;
@@ -87,21 +88,21 @@ static int plat_nand_probe(struct platform_device *pdev) 
	}



	/* Scan to find existence of the device */

	if (nand_scan(&data->mtd, pdata->chip.nr_chips)) {

	if (nand_scan(mtd, pdata->chip.nr_chips)) {

		err = -ENXIO;

		goto out;

	}



	part_types = pdata->chip.part_probe_types;



	err = mtd_device_parse_register(&data->mtd, part_types, NULL,

	err = mtd_device_parse_register(mtd, part_types, NULL,

					pdata->chip.partitions,

					pdata->chip.nr_partitions);



	if (!err)

		return err;



	nand_release(&data->mtd);

	nand_release(mtd);

out:

	if (pdata->ctrl.remove)

		pdata->ctrl.remove(pdev);
@@ -116,7 +117,7 @@ static int plat_nand_remove(struct platform_device *pdev) 
	struct plat_nand_data *data = platform_get_drvdata(pdev);

	struct platform_nand_data *pdata = dev_get_platdata(&pdev->dev);



	nand_release(&data->mtd);

	nand_release(nand_to_mtd(&data->chip));

	if (pdata->ctrl.remove)

		pdata->ctrl.remove(pdev);