diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-04-04 11:26:36 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2013-04-12 01:34:48 +0200 |
| commit | 2de1d5e159ccf317a9285a0dfaa6e4262500d7dd (patch) | |
| tree | 58a23dbcc4f03f7e10c5e2cdc75753eb40167124 /drivers/ata | |
| parent | fsl/sata: create a sysfs entry for rx water mark (diff) | |
| download | linux-2de1d5e159ccf317a9285a0dfaa6e4262500d7dd.tar.xz linux-2de1d5e159ccf317a9285a0dfaa6e4262500d7dd.zip | |
sata_rcar: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/sata_rcar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index caf33f620c35..4799868bd733 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -17,6 +17,7 @@ #include <linux/libata.h> #include <linux/platform_device.h> #include <linux/clk.h> +#include <linux/err.h> #define DRV_NAME "sata_rcar" @@ -799,9 +800,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; } |