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

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
...@@ -623,11 +623,14 @@ static int __init nand_davinci_probe(struct platform_device *pdev) ...@@ -623,11 +623,14 @@ static int __init nand_davinci_probe(struct platform_device *pdev)
goto err_nomem; goto err_nomem;
} }
vaddr = devm_request_and_ioremap(&pdev->dev, res1); vaddr = devm_ioremap_resource(&pdev->dev, res1);
base = devm_request_and_ioremap(&pdev->dev, res2); if (IS_ERR(vaddr)) {
if (!vaddr || !base) { ret = PTR_ERR(vaddr);
dev_err(&pdev->dev, "ioremap failed\n"); goto err_ioremap;
ret = -EADDRNOTAVAIL; }
base = devm_ioremap_resource(&pdev->dev, res2);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto err_ioremap; goto err_ioremap;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment