diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-18 00:15:07 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-18 07:57:08 -0400 |
commit | d26ec830f5d7345cc501ff6fe9d44c7e23930432 (patch) | |
tree | d96fed40a19c33a536b5107509af44670815e481 /drivers/regulator | |
parent | f5cd8de2ce32e25e399f1d49d4876bf9450163a2 (diff) |
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/regulator')
-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) | |||
722 | ret = -ENODEV; | 722 | ret = -ENODEV; |
723 | goto err; | 723 | goto err; |
724 | } | 724 | } |
725 | abb->base = devm_request_and_ioremap(dev, res); | 725 | abb->base = devm_ioremap_resource(dev, res); |
726 | if (!abb->base) { | 726 | if (IS_ERR(abb->base)) { |
727 | dev_err(dev, "Unable to map '%s'\n", pname); | 727 | ret = PTR_ERR(abb->base); |
728 | ret = -ENOMEM; | ||
729 | goto err; | 728 | goto err; |
730 | } | 729 | } |
731 | 730 | ||
@@ -776,10 +775,9 @@ static int ti_abb_probe(struct platform_device *pdev) | |||
776 | ret = -ENODEV; | 775 | ret = -ENODEV; |
777 | goto skip_opt; | 776 | goto skip_opt; |
778 | } | 777 | } |
779 | abb->ldo_base = devm_request_and_ioremap(dev, res); | 778 | abb->ldo_base = devm_ioremap_resource(dev, res); |
780 | if (!abb->ldo_base) { | 779 | if (IS_ERR(abb->ldo_base)) { |
781 | dev_err(dev, "Unable to map '%s'\n", pname); | 780 | ret = PTR_ERR(abb->ldo_base); |
782 | ret = -ENOMEM; | ||
783 | goto err; | 781 | goto err; |
784 | } | 782 | } |
785 | 783 | ||