3 files changed, 74 insertions, 115 deletions

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index fe822a14d130..e372257a8494 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -100,10 +100,8 @@ config LP8788_ADC
 config MAX1363
         tristate "Maxim max1363 ADC driver"
         depends on I2C
-        select IIO_TRIGGER
-        select MAX1363_RING_BUFFER
         select IIO_BUFFER
-        select IIO_KFIFO_BUF
+        select IIO_TRIGGERED_BUFFER
         help
           Say yes here to build support for many Maxim i2c analog to digital
           converters (ADC). (max1361, max1362, max1363, max1364, max1036,
diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index 72955e45e9e0..763f57565ee4 100644
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -179,7 +179,7 @@ static int lp8788_iio_map_register(struct iio_dev *indio_dev,
 
         ret = iio_map_array_register(indio_dev, map);
         if (ret) {
-                dev_err(adc->lp->dev, "iio map err: %d\n", ret);
+                dev_err(&indio_dev->dev, "iio map err: %d\n", ret);
                 return ret;
         }
 
@@ -187,12 +187,6 @@ static int lp8788_iio_map_register(struct iio_dev *indio_dev,
         return 0;
 }
 
-static inline void lp8788_iio_map_unregister(struct iio_dev *indio_dev,
-                                struct lp8788_adc *adc)
-{
-        iio_map_array_unregister(indio_dev, adc->map);
-}
-
 static int lp8788_adc_probe(struct platform_device *pdev)
 {
         struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
@@ -208,13 +202,14 @@ static int lp8788_adc_probe(struct platform_device *pdev)
         adc->lp = lp;
         platform_set_drvdata(pdev, indio_dev);
 
+        indio_dev->dev.of_node = pdev->dev.of_node;
         ret = lp8788_iio_map_register(indio_dev, lp->pdata, adc);
         if (ret)
                 goto err_iio_map;
 
         mutex_init(&adc->lock);
 
-        indio_dev->dev.parent = lp->dev;
+        indio_dev->dev.parent = &pdev->dev;
         indio_dev->name = pdev->name;
         indio_dev->modes = INDIO_DIRECT_MODE;
         indio_dev->info = &lp8788_adc_info;
@@ -223,14 +218,14 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 
         ret = iio_device_register(indio_dev);
         if (ret) {
-                dev_err(lp->dev, "iio dev register err: %d\n", ret);
+                dev_err(&pdev->dev, "iio dev register err: %d\n", ret);
                 goto err_iio_device;
         }
 
         return 0;
 
 err_iio_device:
-        lp8788_iio_map_unregister(indio_dev, adc);
+        iio_map_array_unregister(indio_dev);
 err_iio_map:
         iio_device_free(indio_dev);
         return ret;
@@ -239,10 +234,9 @@ err_iio_map:
 static int lp8788_adc_remove(struct platform_device *pdev)
 {
         struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-        struct lp8788_adc *adc = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        lp8788_iio_map_unregister(indio_dev, adc);
+        iio_map_array_unregister(indio_dev);
         iio_device_free(indio_dev);
 
         return 0;
diff --git a/drivers/iio/adc/max1363.c b/drivers/iio/adc/max1363.c
index 03b25b3dc71e..6c1cfb74bdfc 100644
--- a/drivers/iio/adc/max1363.c
+++ b/drivers/iio/adc/max1363.c
@@ -39,6 +39,7 @@
 #include <linux/iio/driver.h>
 #include <linux/iio/kfifo_buf.h>
 #include <linux/iio/trigger_consumer.h>
+#include <linux/iio/triggered_buffer.h>
 
 #define MAX1363_SETUP_BYTE(a) ((a) | 0x80)
 
@@ -55,7 +56,7 @@
 #define MAX1363_SETUP_POWER_UP_INT_REF          0x10
 #define MAX1363_SETUP_POWER_DOWN_INT_REF        0x00
 
-/* think about includeing max11600 etc - more settings */
+/* think about including max11600 etc - more settings */
 #define MAX1363_SETUP_EXT_CLOCK                 0x08
 #define MAX1363_SETUP_INT_CLOCK                 0x00
 #define MAX1363_SETUP_UNIPOLAR                  0x00
@@ -86,7 +87,7 @@
 /* max123{6-9} only */
 #define MAX1236_SCAN_MID_TO_CHANNEL             0x40
 
-/* max1363 only - merely part of channel selects or don't care for others*/
+/* max1363 only - merely part of channel selects or don't care for others */
 #define MAX1363_CONFIG_EN_MON_MODE_READ 0x18
 
 #define MAX1363_CHANNEL_SEL(a) ((a) << 1)
@@ -133,7 +134,7 @@ enum max1363_modes {
  * @mode_list:          array of available scan modes
  * @default_mode:       the scan mode in which the chip starts up
  * @int_vref_mv:        the internal reference voltage
- * @num_channels:       number of channels
+ * @num_modes:          number of modes
  * @bits:               accuracy of the adc in bits
  */
 struct max1363_chip_info {
@@ -152,7 +153,7 @@ struct max1363_chip_info {
  * @client:             i2c_client
  * @setupbyte:          cache of current device setup byte
  * @configbyte:         cache of current device config byte
- * @chip_info:          chip model specific constants, available modes etc
+ * @chip_info:          chip model specific constants, available modes, etc.
  * @current_mode:       the scan mode of this chip
  * @requestedmask:      a valid requested set of channels
  * @reg:                supply regulator
@@ -162,6 +163,8 @@ struct max1363_chip_info {
  * @mask_low:           bitmask for enabled low thresholds
  * @thresh_high:        high threshold values
  * @thresh_low:         low threshold values
+ * @vref:               Reference voltage regulator
+ * @vref_uv:            Actual (external or internal) reference voltage
  */
 struct max1363_state {
         struct i2c_client               *client;
@@ -181,6 +184,8 @@ struct max1363_state {
         /* 4x unipolar first then the fours bipolar ones */
         s16                             thresh_high[8];
         s16                             thresh_low[8];
+        struct regulator                *vref;
+        u32                             vref_uv;
 };
 
 #define MAX1363_MODE_SINGLE(_num, _mask) {                              \
@@ -293,7 +298,7 @@ static const struct max1363_mode max1363_mode_table[] = {
 
 static const struct max1363_mode
 *max1363_match_mode(const unsigned long *mask,
-const struct max1363_chip_info *ci)
+        const struct max1363_chip_info *ci)
 {
         int i;
         if (mask)
@@ -334,7 +339,7 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
 {
         int ret = 0;
         s32 data;
-        char rxbuf[2];
+        u8 rxbuf[2];
         struct max1363_state *st = iio_priv(indio_dev);
         struct i2c_client *client = st->client;
 
@@ -366,7 +371,8 @@ static int max1363_read_single_chan(struct iio_dev *indio_dev,
                         ret = data;
                         goto error_ret;
                 }
-                data = (s32)(rxbuf[1]) | ((s32)(rxbuf[0] & 0x0F)) << 8;
+                data = (rxbuf[1] | rxbuf[0] << 8) &
+                  ((1 << st->chip_info->bits) - 1);
         } else {
                 /* Get reading */
                 data = i2c_master_recv(client, rxbuf, 1);
@@ -391,6 +397,8 @@ static int max1363_read_raw(struct iio_dev *indio_dev,
 {
         struct max1363_state *st = iio_priv(indio_dev);
         int ret;
+        unsigned long scale_uv;
+
         switch (m) {
         case IIO_CHAN_INFO_RAW:
                 ret = max1363_read_single_chan(indio_dev, chan, val, m);
@@ -398,16 +406,10 @@ static int max1363_read_raw(struct iio_dev *indio_dev,
                         return ret;
                 return IIO_VAL_INT;
         case IIO_CHAN_INFO_SCALE:
-                if ((1 << (st->chip_info->bits + 1)) >
-                    st->chip_info->int_vref_mv) {
-                        *val = 0;
-                        *val2 = 500000;
-                        return IIO_VAL_INT_PLUS_MICRO;
-                } else {
-                        *val = (st->chip_info->int_vref_mv)
-                                >> st->chip_info->bits;
-                        return IIO_VAL_INT;
-                }
+                scale_uv = st->vref_uv >> st->chip_info->bits;
+                *val = scale_uv / 1000;
+                *val2 = (scale_uv % 1000) * 1000;
+                return IIO_VAL_INT_PLUS_MICRO;
         default:
                 return -EINVAL;
         }
@@ -1388,13 +1390,17 @@ static const struct max1363_chip_info max1363_chip_info_tbl[] = {
 
 static int max1363_initial_setup(struct max1363_state *st)
 {
-        st->setupbyte = MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_VDD
-                | MAX1363_SETUP_POWER_UP_INT_REF
-                | MAX1363_SETUP_INT_CLOCK
+        st->setupbyte = MAX1363_SETUP_INT_CLOCK
                 | MAX1363_SETUP_UNIPOLAR
                 | MAX1363_SETUP_NORESET;
 
-        /* Set scan mode writes the config anyway so wait until then*/
+        if (st->vref)
+                st->setupbyte |= MAX1363_SETUP_AIN3_IS_REF_EXT_TO_REF;
+        else
+                st->setupbyte |= MAX1363_SETUP_POWER_UP_INT_REF
+                  | MAX1363_SETUP_AIN3_IS_AIN3_REF_IS_INT;
+
+        /* Set scan mode writes the config anyway so wait until then */
         st->setupbyte = MAX1363_SETUP_BYTE(st->setupbyte);
         st->current_mode = &max1363_mode_table[st->chip_info->default_mode];
         st->configbyte = MAX1363_CONFIG_BYTE(st->configbyte);
@@ -1408,8 +1414,9 @@ static int max1363_alloc_scan_masks(struct iio_dev *indio_dev)
         unsigned long *masks;
         int i;
 
-        masks = kzalloc(BITS_TO_LONGS(MAX1363_MAX_CHANNELS)*sizeof(long)*
-                          (st->chip_info->num_modes + 1), GFP_KERNEL);
+        masks = devm_kzalloc(&indio_dev->dev,
+                        BITS_TO_LONGS(MAX1363_MAX_CHANNELS) * sizeof(long) *
+                        (st->chip_info->num_modes + 1), GFP_KERNEL);
         if (!masks)
                 return -ENOMEM;
 
@@ -1423,7 +1430,6 @@ static int max1363_alloc_scan_masks(struct iio_dev *indio_dev)
         return 0;
 }
 
-
 static irqreturn_t max1363_trigger_handler(int irq, void *p)
 {
         struct iio_poll_func *pf = p;
@@ -1483,54 +1489,13 @@ static const struct iio_buffer_setup_ops max1363_buffered_setup_ops = {
         .predisable = &iio_triggered_buffer_predisable,
 };
 
-static int max1363_register_buffered_funcs_and_init(struct iio_dev *indio_dev)
-{
-        struct max1363_state *st = iio_priv(indio_dev);
-        int ret = 0;
-
-        indio_dev->buffer = iio_kfifo_allocate(indio_dev);
-        if (!indio_dev->buffer) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
-        indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
-                                                 &max1363_trigger_handler,
-                                                 IRQF_ONESHOT,
-                                                 indio_dev,
-                                                 "%s_consumer%d",
-                                                 st->client->name,
-                                                 indio_dev->id);
-        if (indio_dev->pollfunc == NULL) {
-                ret = -ENOMEM;
-                goto error_deallocate_sw_rb;
-        }
-        /* Buffer functions - here trigger setup related */
-        indio_dev->setup_ops = &max1363_buffered_setup_ops;
-
-        /* Flag that polled buffering is possible */
-        indio_dev->modes |= INDIO_BUFFER_TRIGGERED;
-
-        return 0;
-
-error_deallocate_sw_rb:
-        iio_kfifo_free(indio_dev->buffer);
-error_ret:
-        return ret;
-}
-
-static void max1363_buffer_cleanup(struct iio_dev *indio_dev)
-{
-        /* ensure that the trigger has been detached */
-        iio_dealloc_pollfunc(indio_dev->pollfunc);
-        iio_kfifo_free(indio_dev->buffer);
-}
-
 static int max1363_probe(struct i2c_client *client,
                          const struct i2c_device_id *id)
 {
         int ret;
         struct max1363_state *st;
         struct iio_dev *indio_dev;
+        struct regulator *vref;
 
         indio_dev = iio_device_alloc(sizeof(struct max1363_state));
         if (indio_dev == NULL) {
@@ -1538,13 +1503,14 @@ static int max1363_probe(struct i2c_client *client,
                 goto error_out;
         }
 
+        indio_dev->dev.of_node = client->dev.of_node;
         ret = iio_map_array_register(indio_dev, client->dev.platform_data);
         if (ret < 0)
                 goto error_free_device;
 
         st = iio_priv(indio_dev);
 
-        st->reg = regulator_get(&client->dev, "vcc");
+        st->reg = devm_regulator_get(&client->dev, "vcc");
         if (IS_ERR(st->reg)) {
                 ret = PTR_ERR(st->reg);
                 goto error_unregister_map;
@@ -1552,7 +1518,7 @@ static int max1363_probe(struct i2c_client *client,
 
         ret = regulator_enable(st->reg);
         if (ret)
-                goto error_put_reg;
+                goto error_unregister_map;
 
         /* this is only used for device removal purposes */
         i2c_set_clientdata(client, indio_dev);
@@ -1560,35 +1526,45 @@ static int max1363_probe(struct i2c_client *client,
         st->chip_info = &max1363_chip_info_tbl[id->driver_data];
         st->client = client;
 
+        st->vref_uv = st->chip_info->int_vref_mv * 1000;
+        vref = devm_regulator_get(&client->dev, "vref");
+        if (!IS_ERR(vref)) {
+                int vref_uv;
+
+                ret = regulator_enable(vref);
+                if (ret)
+                        goto error_disable_reg;
+                st->vref = vref;
+                vref_uv = regulator_get_voltage(vref);
+                if (vref_uv <= 0) {
+                        ret = -EINVAL;
+                        goto error_disable_reg;
+                }
+                st->vref_uv = vref_uv;
+        }
+
         ret = max1363_alloc_scan_masks(indio_dev);
         if (ret)
                 goto error_disable_reg;
 
-        /* Estabilish that the iio_dev is a child of the i2c device */
+        /* Establish that the iio_dev is a child of the i2c device */
         indio_dev->dev.parent = &client->dev;
         indio_dev->name = id->name;
         indio_dev->channels = st->chip_info->channels;
         indio_dev->num_channels = st->chip_info->num_channels;
         indio_dev->info = st->chip_info->info;
         indio_dev->modes = INDIO_DIRECT_MODE;
-        indio_dev->channels = st->chip_info->channels;
-        indio_dev->num_channels = st->chip_info->num_channels;
         ret = max1363_initial_setup(st);
         if (ret < 0)
-                goto error_free_available_scan_masks;
-
-        ret = max1363_register_buffered_funcs_and_init(indio_dev);
-        if (ret)
-                goto error_free_available_scan_masks;
+                goto error_disable_reg;
 
-        ret = iio_buffer_register(indio_dev,
-                                  st->chip_info->channels,
-                                  st->chip_info->num_channels);
+        ret = iio_triggered_buffer_setup(indio_dev, NULL,
+                &max1363_trigger_handler, &max1363_buffered_setup_ops);
         if (ret)
-                goto error_cleanup_buffer;
+                goto error_disable_reg;
 
         if (client->irq) {
-                ret = request_threaded_irq(st->client->irq,
+                ret = devm_request_threaded_irq(&client->dev, st->client->irq,
                                            NULL,
                                            &max1363_event_handler,
                                            IRQF_TRIGGER_RISING | IRQF_ONESHOT,
@@ -1601,24 +1577,18 @@ static int max1363_probe(struct i2c_client *client,
 
         ret = iio_device_register(indio_dev);
         if (ret < 0)
-                goto error_free_irq;
+                goto error_uninit_buffer;
 
         return 0;
-error_free_irq:
-        if (client->irq)
-                free_irq(st->client->irq, indio_dev);
+
 error_uninit_buffer:
-        iio_buffer_unregister(indio_dev);
-error_cleanup_buffer:
-        max1363_buffer_cleanup(indio_dev);
-error_free_available_scan_masks:
-        kfree(indio_dev->available_scan_masks);
+        iio_triggered_buffer_cleanup(indio_dev);
 error_disable_reg:
+        if (st->vref)
+                regulator_disable(st->vref);
         regulator_disable(st->reg);
-error_put_reg:
-        regulator_put(st->reg);
 error_unregister_map:
-        iio_map_array_unregister(indio_dev, client->dev.platform_data);
+        iio_map_array_unregister(indio_dev);
 error_free_device:
         iio_device_free(indio_dev);
 error_out:
@@ -1631,14 +1601,11 @@ static int max1363_remove(struct i2c_client *client)
         struct max1363_state *st = iio_priv(indio_dev);
 
         iio_device_unregister(indio_dev);
-        if (client->irq)
-                free_irq(st->client->irq, indio_dev);
-        iio_buffer_unregister(indio_dev);
-        max1363_buffer_cleanup(indio_dev);
-        kfree(indio_dev->available_scan_masks);
+        iio_triggered_buffer_cleanup(indio_dev);
+        if (st->vref)
+                regulator_disable(st->vref);
         regulator_disable(st->reg);
-        regulator_put(st->reg);
-        iio_map_array_unregister(indio_dev, client->dev.platform_data);
+        iio_map_array_unregister(indio_dev);
         iio_device_free(indio_dev);
 
         return 0;