| Message ID | 1367500934-28030-1-git-send-email-laurent.navet@gmail.com |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 02-05-2013 17:22, Laurent Navet wrote: > 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: Laurent Navet <laurent.navet@gmail.com> > --- > drivers/mtd/nand/davinci_nand.c | 13 ++++++++----- > 1 file changed, 8 insertions(+), 5 deletions(-) > diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c > index 94e17af..4a96e58 100644 > --- a/drivers/mtd/nand/davinci_nand.c > +++ b/drivers/mtd/nand/davinci_nand.c > @@ -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); > + base = devm_ioremap_resource(&pdev->dev, res2); I'd rather put this line before its corresponding error check. > + if (IS_ERR(vaddr)) { > + ret = PTR_ERR(vaddr); > + goto err_ioremap; > + } > + if (IS_ERR(base)) { > + ret = PTR_ERR(base); > goto err_ioremap; > } WBR, Sergei
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index 94e17af..4a96e58 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c @@ -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); + base = devm_ioremap_resource(&pdev->dev, res2); + if (IS_ERR(vaddr)) { + ret = PTR_ERR(vaddr); + goto err_ioremap; + } + if (IS_ERR(base)) { + ret = PTR_ERR(base); goto err_ioremap; }
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: Laurent Navet <laurent.navet@gmail.com> --- drivers/mtd/nand/davinci_nand.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)