mmc: Convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Chris Ball <cjb@laptop.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 5e1fb1d2c422447b62c5c264f1a7be014a5c2f87..41c27b74b003e5c742cdfcc3d57ba2a002836791 100644 (file)
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -10,6 +10,7 @@
  * (at your option) any later version.
  */
 
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/io.h>
@@ -46,9 +47,9 @@ int dw_mci_pltfm_register(struct platform_device *pdev,
        host->dev = &pdev->dev;
        host->irq_flags = 0;
        host->pdata = pdev->dev.platform_data;
-       host->regs = devm_request_and_ioremap(&pdev->dev, regs);
-       if (!host->regs)
-               return -ENOMEM;
+       host->regs = devm_ioremap_resource(&pdev->dev, regs);
+       if (IS_ERR(host->regs))
+               return PTR_ERR(host->regs);
 
        if (drv_data && drv_data->init) {
                ret = drv_data->init(host);

diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 206fe499ded5b565a21f473291652930aa81a356..5b665551a6f3a6b47add5a939ab1c93959038222 100644 (file)
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -614,9 +614,9 @@ static int mxs_mmc_probe(struct platform_device *pdev)
        host = mmc_priv(mmc);
        ssp = &host->ssp;
        ssp->dev = &pdev->dev;
-       ssp->base = devm_request_and_ioremap(&pdev->dev, iores);
-       if (!ssp->base) {
-               ret = -EADDRNOTAVAIL;
+       ssp->base = devm_ioremap_resource(&pdev->dev, iores);
+       if (IS_ERR(ssp->base)) {
+               ret = PTR_ERR(ssp->base);
                goto out_mmc_free;
        }
 

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 82a8de148a8fd5abaa000cec9cbe97c7c73b2398..a0c621421ee8bbecbf84d8b7499dc3a65950d750 100644 (file)
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -651,10 +651,9 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
 #endif
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       host->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
-       if (!host->ioaddr) {
-               dev_err(dev, "failed to map registers\n");
-               ret = -ENXIO;
+       host->ioaddr = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(host->ioaddr)) {
+               ret = PTR_ERR(host->ioaddr);
                goto err_req_regs;
        }