aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/adc
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-04-03 02:23:00 -0400
committerJonathan Cameron <jic23@kernel.org>2013-05-22 17:18:22 -0400
commitc619653d77a5d59abe9166da57f3686b7f067745 (patch)
treeff2c1f5dee4bc03ee43e4002caeb8d20480ad6f5 /drivers/iio/adc
parent39441078f76cf6733364f16e5c5b645c83de3c6e (diff)
adc: exynos_adc: Convert to devm_ioremap_resource()
Use the newly introduced devm_ioremap_resource() instead of devm_request_and_ioremap() which provides more consistent error handling. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r--drivers/iio/adc/exynos_adc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index 9f3a8ef1fb3e..22d034a55a62 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -270,16 +270,16 @@ static int exynos_adc_probe(struct platform_device *pdev)
270 info = iio_priv(indio_dev); 270 info = iio_priv(indio_dev);
271 271
272 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 272 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
273 info->regs = devm_request_and_ioremap(&pdev->dev, mem); 273 info->regs = devm_ioremap_resource(&pdev->dev, mem);
274 if (!info->regs) { 274 if (IS_ERR(info->regs)) {
275 ret = -ENOMEM; 275 ret = PTR_ERR(info->regs);
276 goto err_iio; 276 goto err_iio;
277 } 277 }
278 278
279 mem = platform_get_resource(pdev, IORESOURCE_MEM, 1); 279 mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
280 info->enable_reg = devm_request_and_ioremap(&pdev->dev, mem); 280 info->enable_reg = devm_ioremap_resource(&pdev->dev, mem);
281 if (!info->enable_reg) { 281 if (IS_ERR(info->enable_reg)) {
282 ret = -ENOMEM; 282 ret = PTR_ERR(info->enable_reg);
283 goto err_iio; 283 goto err_iio;
284 } 284 }
285 285