Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tushar Behera and committed by
Mark Brown
d26ec830 f5cd8de2

+6 -8
+6 -8
drivers/regulator/ti-abb-regulator.c
··· 722 722 ret = -ENODEV; 723 723 goto err; 724 724 } 725 - abb->base = devm_request_and_ioremap(dev, res); 726 - if (!abb->base) { 727 - dev_err(dev, "Unable to map '%s'\n", pname); 728 - ret = -ENOMEM; 725 + abb->base = devm_ioremap_resource(dev, res); 726 + if (IS_ERR(abb->base)) { 727 + ret = PTR_ERR(abb->base); 729 728 goto err; 730 729 } 731 730 ··· 775 776 ret = -ENODEV; 776 777 goto skip_opt; 777 778 } 778 - abb->ldo_base = devm_request_and_ioremap(dev, res); 779 - if (!abb->ldo_base) { 780 - dev_err(dev, "Unable to map '%s'\n", pname); 781 - ret = -ENOMEM; 779 + abb->ldo_base = devm_ioremap_resource(dev, res); 780 + if (IS_ERR(abb->ldo_base)) { 781 + ret = PTR_ERR(abb->ldo_base); 782 782 goto err; 783 783 } 784 784