regulator: ti-abb: Convert to use devm_ioremap_resource

[karo-tx-linux.git] / drivers / regulator / ti-abb-regulator.c

diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 870d209ec866a8317f7ef11a116f6f3095549b60..3753ed05e71920085c8bbff804a8728b037c7e72 100644 (file)
--- a/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@ -722,10 +722,9 @@ static int ti_abb_probe(struct platform_device *pdev)
                ret = -ENODEV;
                goto err;
        }
-       abb->base = devm_request_and_ioremap(dev, res);
-       if (!abb->base) {
-               dev_err(dev, "Unable to map '%s'\n", pname);
-               ret = -ENOMEM;
+       abb->base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(abb->base)) {
+               ret = PTR_ERR(abb->base);
                goto err;
        }
 
@@ -776,10 +775,9 @@ static int ti_abb_probe(struct platform_device *pdev)
                ret = -ENODEV;
                goto skip_opt;
        }
-       abb->ldo_base = devm_request_and_ioremap(dev, res);
-       if (!abb->ldo_base) {
-               dev_err(dev, "Unable to map '%s'\n", pname);
-               ret = -ENOMEM;
+       abb->ldo_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(abb->ldo_base)) {
+               ret = PTR_ERR(abb->ldo_base);
                goto err;
        }