]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
regulator: ti-abb: Convert to use devm_ioremap_resource
authorTushar Behera <tushar.behera@linaro.org>
Tue, 18 Jun 2013 04:15:07 +0000 (09:45 +0530)
committerMark Brown <broonie@linaro.org>
Tue, 18 Jun 2013 11:57:08 +0000 (12:57 +0100)
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

While at it, remove the error message as devm_ioremap_resource prints a similar
error message.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/regulator/ti-abb-regulator.c

index 870d209ec866a8317f7ef11a116f6f3095549b60..3753ed05e71920085c8bbff804a8728b037c7e72 100644 (file)
@@ -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;
        }