lkml.org 
[lkml]   [2013]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH V2 11/15] regulator: ti-abb: Convert to use devm_ioremap_resource
Date
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>
CC: Mark Brown <broonie@kernel.org>
CC: Liam Girdwood <lgirdwood@gmail.com>
---
Changes for V2:
* Removed error messages from devm_ioremap_resource exit path

drivers/regulator/ti-abb-regulator.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/regulator/ti-abb-regulator.c b/drivers/regulator/ti-abb-regulator.c
index 870d209..3753ed0 100644
--- 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;
}

--
1.7.9.5


\
 
 \ /
  Last update: 2013-06-18 07:21    [W:0.263 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site