[PATCH v2 2/2] iio: hw_consumer: use new scanmask functions

[Alexandru Ardelean]

From: Lars-Peter Clausen <l...@metafoo.de>

This change moves the handling of the scanmasks to the new wrapper
functions that were added in a previous commit.

Signed-off-by: Lars-Peter Clausen <l...@metafoo.de>
Signed-off-by: Alexandru Ardelean <alexandru.ardel...@analog.com>
---
 drivers/iio/buffer/industrialio-hw-consumer.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/buffer/industrialio-hw-consumer.c 
b/drivers/iio/buffer/industrialio-hw-consumer.c
index f2d27788f666..ca2b6d31cb5c 100644
--- a/drivers/iio/buffer/industrialio-hw-consumer.c
+++ b/drivers/iio/buffer/industrialio-hw-consumer.c
@@ -28,7 +28,6 @@ struct hw_consumer_buffer {
        struct list_head head;
        struct iio_dev *indio_dev;
        struct iio_buffer buffer;
-       long scan_mask[];
 };
 
 static struct hw_consumer_buffer *iio_buffer_to_hw_consumer_buffer(
@@ -41,6 +40,8 @@ static void iio_hw_buf_release(struct iio_buffer *buffer)
 {
        struct hw_consumer_buffer *hw_buf =
                iio_buffer_to_hw_consumer_buffer(buffer);
+
+       iio_buffer_free_scanmask(&hw_buf->buffer);
        kfree(hw_buf);
 }
 
@@ -52,26 +53,34 @@ static const struct iio_buffer_access_funcs 
iio_hw_buf_access = {
 static struct hw_consumer_buffer *iio_hw_consumer_get_buffer(
        struct iio_hw_consumer *hwc, struct iio_dev *indio_dev)
 {
-       size_t mask_size = BITS_TO_LONGS(indio_dev->masklength) * sizeof(long);
        struct hw_consumer_buffer *buf;
+       int ret;
 
        list_for_each_entry(buf, &hwc->buffers, head) {
                if (buf->indio_dev == indio_dev)
                        return buf;
        }
 
-       buf = kzalloc(sizeof(*buf) + mask_size, GFP_KERNEL);
+       buf = kzalloc(sizeof(*buf), GFP_KERNEL);
        if (!buf)
                return NULL;
 
        buf->buffer.access = &iio_hw_buf_access;
        buf->indio_dev = indio_dev;
-       buf->buffer.scan_mask = buf->scan_mask;
 
        iio_buffer_init(&buf->buffer);
+
+       ret = iio_buffer_alloc_scanmask(&buf->buffer, indio_dev->masklength);
+       if (ret)
+               goto err_free_buf;
+
        list_add_tail(&buf->head, &hwc->buffers);
 
        return buf;
+
+err_free_buf:
+       kfree(buf);
+       return NULL;
 }
 
 /**
@@ -106,7 +115,7 @@ struct iio_hw_consumer *iio_hw_consumer_alloc(struct device 
*dev)
                        ret = -ENOMEM;
                        goto err_put_buffers;
                }
-               set_bit(chan->channel->scan_index, buf->buffer.scan_mask);
+               iio_buffer_channel_enable(&buf->buffer, chan);
                chan++;
        }
 
-- 
2.17.1