iio: Convert to devm_ioremap_resource()
authorThierry Reding <thierry.reding@avionic-design.de>
Mon, 21 Jan 2013 10:09:04 +0000 (11:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 22 Jan 2013 19:41:56 +0000 (11:41 -0800)
Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/adc/at91_adc.c

index a526c0e..83c836b 100644 (file)
@@ -557,9 +557,9 @@ static int at91_adc_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       st->reg_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!st->reg_base) {
-               ret = -ENOMEM;
+       st->reg_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(st->reg_base)) {
+               ret = PTR_ERR(st->reg_base);
                goto error_free_device;
        }