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

Commit 59bff7fb authored by Laurent Navet's avatar Laurent Navet Committed by David Woodhouse
Browse files

mtd: nand: davinci: use devm_ioremap_resource() 



Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.

Found with coccicheck and this semantic patch:
 scripts/coccinelle/api/devm_request_and_ioremap.cocci.

Signed-off-by: default avatarLaurent Navet <laurent.navet@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent d914c932

drivers/mtd/nand/davinci_nand.c

+8 −5
Original line number Diff line number Diff line
@@ -623,11 +623,14 @@ static int __init nand_davinci_probe(struct platform_device *pdev) 
		goto err_nomem;

	}



	vaddr = devm_request_and_ioremap(&pdev->dev, res1);

	base = devm_request_and_ioremap(&pdev->dev, res2);

	if (!vaddr || !base) {

		dev_err(&pdev->dev, "ioremap failed\n");

		ret = -EADDRNOTAVAIL;

	vaddr = devm_ioremap_resource(&pdev->dev, res1);

	if (IS_ERR(vaddr)) {

		ret = PTR_ERR(vaddr);

		goto err_ioremap;

	}

	base = devm_ioremap_resource(&pdev->dev, res2);

	if (IS_ERR(base)) {

		ret = PTR_ERR(base);

		goto err_ioremap;

	}