Merge tag 'iio-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

[mirror_ubuntu-zesty-kernel.git] / drivers / staging / iio / adc / ad7780.c

diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index 3abc7789237f7220945e3df0df0b9f837e7d0c88..1439cfdbb09c8981ada13d2b6aba213ac7dd9748 100644 (file)
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -15,15 +15,13 @@
 #include <linux/regulator/consumer.h>
 #include <linux/err.h>
 #include <linux/sched.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/module.h>
 
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/adc/ad_sigma_delta.h>
 
-#include "ad7780.h"
-
 #define AD7780_RDY     BIT(7)
 #define AD7780_FILTER  BIT(6)
 #define AD7780_ERR     BIT(5)
@@ -42,7 +40,7 @@ struct ad7780_chip_info {
 struct ad7780_state {
        const struct ad7780_chip_info   *chip_info;
        struct regulator                *reg;
-       int                             powerdown_gpio;
+       struct gpio_desc                *powerdown_gpio;
        unsigned int    gain;
        u16                             int_vref_mv;
 
@@ -77,8 +75,7 @@ static int ad7780_set_mode(struct ad_sigma_delta *sigma_delta,
                break;
        }
 
-       if (gpio_is_valid(st->powerdown_gpio))
-               gpio_set_value(st->powerdown_gpio, val);
+       gpiod_set_value(st->powerdown_gpio, val);
 
        return 0;
 }
@@ -163,7 +160,6 @@ static const struct iio_info ad7780_info = {
 
 static int ad7780_probe(struct spi_device *spi)
 {
-       struct ad7780_platform_data *pdata = spi->dev.platform_data;
        struct ad7780_state *st;
        struct iio_dev *indio_dev;
        int ret, voltage_uv = 0;
@@ -189,12 +185,10 @@ static int ad7780_probe(struct spi_device *spi)
        st->chip_info =
                &ad7780_chip_info_tbl[spi_get_device_id(spi)->driver_data];
 
-       if (pdata && pdata->vref_mv)
-               st->int_vref_mv = pdata->vref_mv;
-       else if (voltage_uv)
+       if (voltage_uv)
                st->int_vref_mv = voltage_uv / 1000;
        else
-               dev_warn(&spi->dev, "reference voltage unspecified\n");
+               dev_warn(&spi->dev, "Reference voltage unspecified\n");
 
        spi_set_drvdata(spi, indio_dev);
 
@@ -205,18 +199,14 @@ static int ad7780_probe(struct spi_device *spi)
        indio_dev->num_channels = 1;
        indio_dev->info = &ad7780_info;
 
-       if (pdata && gpio_is_valid(pdata->gpio_pdrst)) {
-               ret = devm_gpio_request_one(&spi->dev,
-                                           pdata->gpio_pdrst,
-                                           GPIOF_OUT_INIT_LOW,
-                                           "AD7780 /PDRST");
-               if (ret) {
-                       dev_err(&spi->dev, "failed to request GPIO PDRST\n");
-                       goto error_disable_reg;
-               }
-               st->powerdown_gpio = pdata->gpio_pdrst;
-       } else {
-               st->powerdown_gpio = -1;
+       st->powerdown_gpio = devm_gpiod_get_optional(&spi->dev,
+                                                    "powerdown",
+                                                    GPIOD_OUT_LOW);
+       if (IS_ERR(st->powerdown_gpio)) {
+               ret = PTR_ERR(st->powerdown_gpio);
+               dev_err(&spi->dev, "Failed to request powerdown GPIO: %d\n",
+                       ret);
+               goto error_disable_reg;
        }
 
        ret = ad_sd_setup_buffer_and_trigger(indio_dev);