Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d26ec830 authored by Tushar Behera's avatar Tushar Behera Committed by Mark Brown
Browse files

regulator: ti-abb: Convert to use devm_ioremap_resource 



Commit 75096579 ("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: default avatarTushar Behera <tushar.behera@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent f5cd8de2

drivers/regulator/ti-abb-regulator.c

+6 −8
Original line number Diff line number Diff line
@@ -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;

	}