lkml.org 
[lkml]   [2020]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 2/4] iio: hw_consumer: use new scanmask functions
    Date
    From: Lars-Peter Clausen <lars@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 <lars@metafoo.de>
    Signed-off-by: Alexandru Ardelean <alexandru.ardelean@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..f1cc72520685 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(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);
    + 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
    \
     
     \ /
      Last update: 2020-04-24 07:18    [W:3.351 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site