| Message ID | 1371528907-14425-1-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Jun 18, 2013 at 09:45:07AM +0530, Tushar Behera wrote: > Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") > introduced devm_ioremap_resource() and deprecated the use of > devm_request_and_ioremap(). I've applied this. In future please do remember that if you're not sending a patch series you shouldn't mark it as being part of one, people will only wonder where the rest of the series is and miss things. You haven't sent me 15 patches, you've sent me a single patch.
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; }
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(-)