diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-18 06:15:07 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-18 13:57:08 +0200 |
| commit | d26ec830f5d7345cc501ff6fe9d44c7e23930432 (patch) | |
| tree | d96fed40a19c33a536b5107509af44670815e481 /drivers | |
| parent | regulator: ti-abb: Fix off-by-one valid range checking for abb->current_info_idx (diff) | |
| download | linux-d26ec830f5d7345cc501ff6fe9d44c7e23930432.tar.xz linux-d26ec830f5d7345cc501ff6fe9d44c7e23930432.zip | |
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 <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/ti-abb-regulator.c | 14 |
1 files 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; } |