i2c: 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>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 20d41bfa7c19..a9bf4ca78bb9 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1103,11 +1103,9 @@ omap_i2c_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        dev->base = devm_request_and_ioremap(&pdev->dev, mem);
-        if (!dev->base) {
-                dev_err(&pdev->dev, "I2C region already claimed\n");
-                return -ENOMEM;
-        }
+        dev->base = devm_ioremap_resource(&pdev->dev, mem);
+        if (IS_ERR(dev->base))
+                return PTR_ERR(dev->base);
 
         match = of_match_device(of_match_ptr(omap_i2c_of_match), &pdev->dev);
         if (match) {