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>

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 82a8de148a8f..a0c621421ee8 100644
--- 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;
         }