Merge tag 'iio-for-3.18a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next

Jonathan writes:

1st round of new IIO drivers, functionality and cleanups for the 3.18 cycle.

Maintainer Updates

* Add 3 designated reviewers for IIO.  Lars, Peter and Hartmut have been
  actively reviewing a lot of patches for a while now so this reflects
  the status quo.  These three are probably the only reason I keep
  my head above the water!

New drivers and device support

* max5821 DAC
* Rockchip SARADC
* TI ADC128S052 ADC
* BMC150 Accelerometer
* exynos ADC driver gains support for s3c24xx and s3c64xx parts.
* kxcjk-1013 gainst range control and runtime PM support to drive
  down it's power usage.

Driver removals

* Drop ad5930, ad99850, ad9852, ad9910 and ad9951 drivers on the simple
  basis that they drivers just provided a register write function with
  no compliant user space ABI whatsoever.  Much better to drop them and
  start again for these in the fullness of time.

Core Enhancements

* Join together neighbouring elements in the demux units that feeds
  the binary interfaces.  This cuts down on the number of individual
  copies needed  when splitting out individual channels from the incoming
  channel scans.
* Other demux related cleanups such as using roundup instead of a local
  implementation.

Cleanups

* Drop an unnecessary double setting of the owner field in xilinx adc.
* Some more patches to use managed (devm) interfaces to cut down on
  complexity of removal code.
* adis16060 coding style fixlets.
* Fix some incorrect error returns in the Xilinx ADC driver.
* Coding style fixlets for various accelerometer drivers.
* Some sparse warning fixes to do with endianness and sign of variables.
* Fix an incorrect and entirely pointless use of sizeof on a dynamic pointer
  in hid-sensor-magn-3d by dropping the relevant code.

1 files changed, 33 insertions, 30 deletions

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 0472ee268271..f971f79103ec 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -942,13 +942,34 @@ int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data)
 }
 EXPORT_SYMBOL_GPL(iio_push_to_buffers);
 
+static int iio_buffer_add_demux(struct iio_buffer *buffer,
+        struct iio_demux_table **p, unsigned int in_loc, unsigned int out_loc,
+        unsigned int length)
+{
+
+        if (*p && (*p)->from + (*p)->length == in_loc &&
+                (*p)->to + (*p)->length == out_loc) {
+                (*p)->length += length;
+        } else {
+                *p = kmalloc(sizeof(**p), GFP_KERNEL);
+                if (*p == NULL)
+                        return -ENOMEM;
+                (*p)->from = in_loc;
+                (*p)->to = out_loc;
+                (*p)->length = length;
+                list_add_tail(&(*p)->l, &buffer->demux_list);
+        }
+
+        return 0;
+}
+
 static int iio_buffer_update_demux(struct iio_dev *indio_dev,
                                    struct iio_buffer *buffer)
 {
         const struct iio_chan_spec *ch;
         int ret, in_ind = -1, out_ind, length;
         unsigned in_loc = 0, out_loc = 0;
-        struct iio_demux_table *p;
+        struct iio_demux_table *p = NULL;
 
         /* Clear out any old demux */
         iio_buffer_demux_free(buffer);
@@ -979,14 +1000,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
                         else
                                 length = ch->scan_type.storagebits / 8;
                         /* Make sure we are aligned */
-                        in_loc += length;
-                        if (in_loc % length)
-                                in_loc += length - in_loc % length;
-                }
-                p = kmalloc(sizeof(*p), GFP_KERNEL);
-                if (p == NULL) {
-                        ret = -ENOMEM;
-                        goto error_clear_mux_table;
+                        in_loc = roundup(in_loc, length) + length;
                 }
                 ch = iio_find_channel_from_si(indio_dev, in_ind);
                 if (ch->scan_type.repeat > 1)
@@ -994,24 +1008,16 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
                                 ch->scan_type.repeat;
                 else
                         length = ch->scan_type.storagebits / 8;
-                if (out_loc % length)
-                        out_loc += length - out_loc % length;
-                if (in_loc % length)
-                        in_loc += length - in_loc % length;
-                p->from = in_loc;
-                p->to = out_loc;
-                p->length = length;
-                list_add_tail(&p->l, &buffer->demux_list);
+                out_loc = roundup(out_loc, length);
+                in_loc = roundup(in_loc, length);
+                ret = iio_buffer_add_demux(buffer, &p, in_loc, out_loc, length);
+                if (ret)
+                        goto error_clear_mux_table;
                 out_loc += length;
                 in_loc += length;
         }
         /* Relies on scan_timestamp being last */
         if (buffer->scan_timestamp) {
-                p = kmalloc(sizeof(*p), GFP_KERNEL);
-                if (p == NULL) {
-                        ret = -ENOMEM;
-                        goto error_clear_mux_table;
-                }
                 ch = iio_find_channel_from_si(indio_dev,
                         indio_dev->scan_index_timestamp);
                 if (ch->scan_type.repeat > 1)
@@ -1019,14 +1025,11 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
                                 ch->scan_type.repeat;
                 else
                         length = ch->scan_type.storagebits / 8;
-                if (out_loc % length)
-                        out_loc += length - out_loc % length;
-                if (in_loc % length)
-                        in_loc += length - in_loc % length;
-                p->from = in_loc;
-                p->to = out_loc;
-                p->length = length;
-                list_add_tail(&p->l, &buffer->demux_list);
+                out_loc = roundup(out_loc, length);
+                in_loc = roundup(in_loc, length);
+                ret = iio_buffer_add_demux(buffer, &p, in_loc, out_loc, length);
+                if (ret)
+                        goto error_clear_mux_table;
                 out_loc += length;
                 in_loc += length;
         }