Use the gpiod interface instead of the deprecated old non-descriptor
interface for ldac_pin.

Signed-off-by: Nishad Kamdar <nishadkam...@gmail.com>
---
 drivers/staging/iio/addac/adt7316.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/iio/addac/adt7316.c 
b/drivers/staging/iio/addac/adt7316.c
index 3f22d1088713..94f945ba0097 100644
--- a/drivers/staging/iio/addac/adt7316.c
+++ b/drivers/staging/iio/addac/adt7316.c
@@ -8,7 +8,7 @@
  */
 
 #include <linux/interrupt.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/workqueue.h>
 #include <linux/device.h>
 #include <linux/kernel.h>
@@ -177,7 +177,7 @@
 
 struct adt7316_chip_info {
        struct adt7316_bus      bus;
-       u16                     ldac_pin;
+       struct gpio_desc        *ldac_pin;
        u16                     int_mask;       /* 0x2f */
        u8                      config1;
        u8                      config2;
@@ -950,8 +950,8 @@ static ssize_t adt7316_store_update_DAC(struct device *dev,
                if (ret)
                        return -EIO;
        } else {
-               gpio_set_value(chip->ldac_pin, 0);
-               gpio_set_value(chip->ldac_pin, 1);
+               gpiod_set_value(chip->ldac_pin, 0);
+               gpiod_set_value(chip->ldac_pin, 1);
        }
 
        return len;
@@ -2120,7 +2120,14 @@ int adt7316_probe(struct device *dev, struct adt7316_bus 
*bus,
        else
                return -ENODEV;
 
-       chip->ldac_pin = adt7316_platform_data[1];
+       chip->ldac_pin = devm_gpiod_get(dev, "ldac", GPIOD_OUT_HIGH);
+       if (IS_ERR(chip->ldac_pin)) {
+               ret = PTR_ERR(chip->ldac_pin);
+               dev_err(dev, "Failed to request ldac GPIO: %d\n",
+                       ret);
+               return ret;
+       }
+
        if (chip->ldac_pin) {
                chip->config3 |= ADT7316_DA_EN_VIA_DAC_LDCA;
                if ((chip->id & ID_FAMILY_MASK) == ID_ADT75XX)
-- 
2.17.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to