From d26ec830f5d7345cc501ff6fe9d44c7e23930432 Mon Sep 17 00:00:00 2001 From: Tushar Behera Date: Tue, 18 Jun 2013 09:45:07 +0530 Subject: [PATCH] regulator: ti-abb: Convert to use devm_ioremap_resource 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 Signed-off-by: Mark Brown --- 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 870d209ec866..3753ed05e719 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; }