i2c: ocores: Use devm_request_and_ioremap()

Replacing the devm_request_mem_region() and devm_ioremap_nocache() calls
by a single call to devm_request_and_ioremap() simplifies the code.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index bffd5501ac2d..1fad4aeb7902 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -283,18 +283,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
         if (!i2c)
                 return -ENOMEM;
 
-        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                     resource_size(res), pdev->name)) {
-                dev_err(&pdev->dev, "Memory region busy\n");
-                return -EBUSY;
-        }
-
-        i2c->base = devm_ioremap_nocache(&pdev->dev, res->start,
-                                         resource_size(res));
-        if (!i2c->base) {
-                dev_err(&pdev->dev, "Unable to map registers\n");
-                return -EIO;
-        }
+        i2c->base = devm_request_and_ioremap(&pdev->dev, res);
+        if (!i2c->base)
+                return -EADDRNOTAVAIL;
 
         pdata = pdev->dev.platform_data;
         if (pdata) {