Patchwork drivers: ata: rcar: use devm_ioremap_resource()

login
register
mail settings
Submitter Silviu-Mihai Popescu
Date April 12, 2013, 6:51 a.m.
Message ID <1365749477-22770-1-git-send-email-silviupopescu1990@gmail.com>
Download mbox | patch
Permalink /patch/235976/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Silviu-Mihai Popescu - April 12, 2013, 6:51 a.m.
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 <silviupopescu1990@gmail.com>
---
 drivers/ata/sata_rcar.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Jeff Garzik - April 12, 2013, 10:23 a.m.
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 <silviupopescu1990@gmail.com>
> ---
>   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




--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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;
 	}