2013-04-12 06:51:23

by Silviu-Mihai Popescu

Subject: [PATCH] drivers: ata: rcar: use devm_ioremap_resource()

Convert use of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.
This was found with coccinelle.

Signed-off-by: Silviu-Mihai Popescu <[email protected]>
---
drivers/ata/sata_rcar.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index caf33f6..8c51a3a 100644
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -799,9 +799,9 @@ static int sata_rcar_probe(struct platform_device *pdev)

host->private_data = priv;

- priv->base = devm_request_and_ioremap(&pdev->dev, mem);
- if (!priv->base) {
- ret = -EADDRNOTAVAIL;
+ priv->base = devm_ioremap_resource(&pdev->dev, mem);
+ if (IS_ERR(priv->base)) {
+ ret = PTR_ERR(priv->base);
goto cleanup;
}

--
1.7.9.5

2013-04-12 10:24:02

by Jeff Garzik

Subject: Re: [PATCH] drivers: ata: rcar: use devm_ioremap_resource()

On 04/12/2013 02:51 AM, Silviu-Mihai Popescu wrote:
> Convert use of devm_request_and_ioremap() to the newly introduced
> devm_ioremap_resource() which provides more consistent error handling.
> This was found with coccinelle.
>
> Signed-off-by: Silviu-Mihai Popescu <[email protected]>
> ---
> drivers/ata/sata_rcar.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
> index caf33f6..8c51a3a 100644
> --- a/drivers/ata/sata_rcar.c
> +++ b/drivers/ata/sata_rcar.c
> @@ -799,9 +799,9 @@ static int sata_rcar_probe(struct platform_device *pdev)
>
> host->private_data = priv;
>
> - priv->base = devm_request_and_ioremap(&pdev->dev, mem);
> - if (!priv->base) {
> - ret = -EADDRNOTAVAIL;
> + priv->base = devm_ioremap_resource(&pdev->dev, mem);
> + if (IS_ERR(priv->base)) {
> + ret = PTR_ERR(priv->base);
> goto cleanup;
> }
>
>

See 2de1d5e159ccf317a9285a0dfaa6e4262500d7dd in libata-dev.git#upstream.

Jeff