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

Commit eef17834 authored by Boris Brezillon's avatar Boris Brezillon Committed by Greg Kroah-Hartman
Browse files

mtd: rawnand: Pass a nand_chip object to nand_release() 



[ Upstream commit 59ac276f22270fb2094910f9a734c17f41c25e70 ]

Let's make the raw NAND API consistent by patching all helpers to
take a nand_chip object instead of an mtd_info one.

Now is nand_release()'s turn.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4c9539a3

Documentation/driver-api/mtdnand.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -277,7 +277,7 @@ unregisters the partitions in the MTD layer. 
    static void __exit board_cleanup (void)

    static void __exit board_cleanup (void)

    {

    {

        /* Release resources, unregister device */

        /* Release resources, unregister device */

        nand_release (board_mtd);

        nand_release (mtd_to_nand(board_mtd));





        /* unmap physical address */

        /* unmap physical address */

        iounmap(baseaddr);

        iounmap(baseaddr);

drivers/mtd/nand/raw/ams-delta.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ static int ams_delta_cleanup(struct platform_device *pdev) 
	void __iomem *io_base = platform_get_drvdata(pdev);

	void __iomem *io_base = platform_get_drvdata(pdev);





	/* Release resources, unregister device */

	/* Release resources, unregister device */

	nand_release(ams_delta_mtd);

	nand_release(mtd_to_nand(ams_delta_mtd));





	gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));

	gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio));

	gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);

	gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB);

drivers/mtd/nand/raw/au1550nd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ static int au1550nd_remove(struct platform_device *pdev) 
	struct au1550nd_ctx *ctx = platform_get_drvdata(pdev);

	struct au1550nd_ctx *ctx = platform_get_drvdata(pdev);

	struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	struct resource *r = platform_get_resource(pdev, IORESOURCE_MEM, 0);





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

	nand_release(&ctx->chip);

	iounmap(ctx->base);

	iounmap(ctx->base);

	release_mem_region(r->start, 0x1000);

	release_mem_region(r->start, 0x1000);

	kfree(ctx);

	kfree(ctx);

drivers/mtd/nand/raw/bcm47xxnflash/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ static int bcm47xxnflash_remove(struct platform_device *pdev) 
{

{

	struct bcm47xxnflash *nflash = platform_get_drvdata(pdev);

	struct bcm47xxnflash *nflash = platform_get_drvdata(pdev);





	nand_release(nand_to_mtd(&nflash->nand_chip));

	nand_release(&nflash->nand_chip);





	return 0;

	return 0;

}

}

drivers/mtd/nand/raw/brcmnand/brcmnand.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2619,7 +2619,7 @@ int brcmnand_remove(struct platform_device *pdev) 
	struct brcmnand_host *host;

	struct brcmnand_host *host;





	list_for_each_entry(host, &ctrl->host_list, node)

	list_for_each_entry(host, &ctrl->host_list, node)

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

		nand_release(&host->chip);





	clk_disable_unprepare(ctrl->clk);

	clk_disable_unprepare(ctrl->clk);