Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().
Signed-off-by: Tushar Behera <tushar.beh...@linaro.org>
CC: Mark Brown <broo...@kernel.org>
CC: Liam Girdwood <lgirdw...@gmail.com>
---
drivers/regulator/ti-abb-regulator.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/regulator/ti-abb-regulator.c
b/drivers/regulator/ti-abb-regulator.c
index 870d209..f494a11 100644
--- a/drivers/regulator/ti-abb-regulator.c
+++ b/drivers/regulator/ti-abb-regulator.c
@@ -722,10 +722,10 @@ static int ti_abb_probe(struct platform_device *pdev)
ret = -ENODEV;
goto err;
}
- abb->base = devm_request_and_ioremap(dev, res);
- if (!abb->base) {
+ abb->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(abb->base)) {
dev_err(dev, "Unable to map '%s'\n", pname);
- ret = -ENOMEM;
+ ret = PTR_ERR(abb->base);
goto err;
}
@@ -776,10 +776,10 @@ 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) {
+ abb->ldo_base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(abb->ldo_base)) {
dev_err(dev, "Unable to map '%s'\n", pname);
- ret = -ENOMEM;
+ ret = PTR_ERR(abb->ldo_base);
goto err;
}
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
