Merge tag 'regulator-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / drivers / iio / adc / twl6030-gpadc.c

diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index 0ea96c058c0880016de8ec9c1b01b9f20c0cd9b0..53e1c645cee7c3e6ec8fb512cf9aea7ba33a7038 100644 (file)
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -887,7 +887,7 @@ static int twl6030_gpadc_probe(struct platform_device *pdev)
        int irq;
        int ret;
 
-       match = of_match_device(of_match_ptr(of_twl6030_match_tbl), dev);
+       match = of_match_device(of_twl6030_match_tbl, dev);
        if (!match)
                return -EINVAL;
 
@@ -948,9 +948,7 @@ static int twl6030_gpadc_probe(struct platform_device *pdev)
        indio_dev->channels = pdata->iio_channels;
        indio_dev->num_channels = pdata->nchannels;
 
-       ret = iio_device_register(indio_dev);
-
-       return ret;
+       return iio_device_register(indio_dev);
 }
 
 static int twl6030_gpadc_remove(struct platform_device *pdev)