On 12/28/2011 11:32 AM, Lars-Peter Clausen wrote:
> Setup the buffer access functions in the buffer allocate function. There is no
> need to let each driver handle this on its own.
>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx>
There may be arguements against the general approach, but this
is still clearly a good cleanup patch, even if we change everything
at a later date!
Jonathan
>
> ---
> Jonathan, since there has been some discussion around this patch I would like
> you to confirm your Acked-by for this patch again, if you still think this
> patch is OK as is.
> ---
> drivers/staging/iio/accel/adis16201_ring.c | 2 -
> drivers/staging/iio/accel/adis16203_ring.c | 2 -
> drivers/staging/iio/accel/adis16204_ring.c | 2 -
> drivers/staging/iio/accel/adis16209_ring.c | 2 -
> drivers/staging/iio/accel/adis16240_ring.c | 2 -
> drivers/staging/iio/accel/lis3l02dq.h | 2 -
> drivers/staging/iio/accel/lis3l02dq_ring.c | 2 -
> drivers/staging/iio/adc/ad7192.c | 2 -
> drivers/staging/iio/adc/ad7298_ring.c | 3 -
> drivers/staging/iio/adc/ad7476_ring.c | 2 -
> drivers/staging/iio/adc/ad7606_ring.c | 2 -
> drivers/staging/iio/adc/ad7793.c | 2 -
> drivers/staging/iio/adc/ad7887_ring.c | 2 -
> drivers/staging/iio/adc/ad799x_ring.c | 2 -
> drivers/staging/iio/adc/max1363_ring.c | 2 -
> drivers/staging/iio/gyro/adis16260_ring.c | 2 -
> drivers/staging/iio/iio_simple_dummy_buffer.c | 2 -
> drivers/staging/iio/impedance-analyzer/ad5933.c | 3 -
> drivers/staging/iio/imu/adis16400_ring.c | 2 -
> drivers/staging/iio/kfifo_buf.c | 46 +++++++++++-----------
> drivers/staging/iio/kfifo_buf.h | 2 -
> drivers/staging/iio/meter/ade7758_ring.c | 2 -
> drivers/staging/iio/ring_sw.c | 22 +++++-----
> drivers/staging/iio/ring_sw.h | 5 --
> 24 files changed, 34 insertions(+), 83 deletions(-)
>
> diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
> index 26c610f..97f9e6b 100644
> --- a/drivers/staging/iio/accel/adis16201_ring.c
> +++ b/drivers/staging/iio/accel/adis16201_ring.c
> @@ -115,9 +115,7 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> ring->scan_timestamp = true;
> - ring->access = &ring_sw_access_funcs;
> indio_dev->setup_ops = &adis16201_ring_setup_ops;
>
> indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
> diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
> index 064640d..6a8963d 100644
> --- a/drivers/staging/iio/accel/adis16203_ring.c
> +++ b/drivers/staging/iio/accel/adis16203_ring.c
> @@ -117,9 +117,7 @@ int adis16203_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> ring->scan_timestamp = true;
> - ring->access = &ring_sw_access_funcs;
> indio_dev->setup_ops = &adis16203_ring_setup_ops;
>
> indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
> diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
> index 4081179..5c8ab73 100644
> --- a/drivers/staging/iio/accel/adis16204_ring.c
> +++ b/drivers/staging/iio/accel/adis16204_ring.c
> @@ -112,8 +112,6 @@ int adis16204_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> - ring->access = &ring_sw_access_funcs;
> ring->scan_timestamp = true;
> indio_dev->setup_ops = &adis16204_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
> index 2a6fd334..57254b6 100644
> --- a/drivers/staging/iio/accel/adis16209_ring.c
> +++ b/drivers/staging/iio/accel/adis16209_ring.c
> @@ -113,8 +113,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> - ring->access = &ring_sw_access_funcs;
> ring->scan_timestamp = true;
> indio_dev->setup_ops = &adis16209_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
> index e23622d..43ba84e 100644
> --- a/drivers/staging/iio/accel/adis16240_ring.c
> +++ b/drivers/staging/iio/accel/adis16240_ring.c
> @@ -110,8 +110,6 @@ int adis16240_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> - ring->access = &ring_sw_access_funcs;
> ring->scan_timestamp = true;
> indio_dev->setup_ops = &adis16240_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/accel/lis3l02dq.h b/drivers/staging/iio/accel/lis3l02dq.h
> index 2db383f..ae5f225 100644
> --- a/drivers/staging/iio/accel/lis3l02dq.h
> +++ b/drivers/staging/iio/accel/lis3l02dq.h
> @@ -187,12 +187,10 @@ void lis3l02dq_unconfigure_buffer(struct iio_dev *indio_dev);
> #ifdef CONFIG_LIS3L02DQ_BUF_RING_SW
> #define lis3l02dq_free_buf iio_sw_rb_free
> #define lis3l02dq_alloc_buf iio_sw_rb_allocate
> -#define lis3l02dq_access_funcs ring_sw_access_funcs
> #endif
> #ifdef CONFIG_LIS3L02DQ_BUF_KFIFO
> #define lis3l02dq_free_buf iio_kfifo_free
> #define lis3l02dq_alloc_buf iio_kfifo_allocate
> -#define lis3l02dq_access_funcs kfifo_access_funcs
> #endif
> irqreturn_t lis3l02dq_data_rdy_trig_poll(int irq, void *private);
> #define lis3l02dq_th lis3l02dq_data_rdy_trig_poll
> diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
> index 98c5c92..ca0a1fe 100644
> --- a/drivers/staging/iio/accel/lis3l02dq_ring.c
> +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
> @@ -406,8 +406,6 @@ int lis3l02dq_configure_buffer(struct iio_dev *indio_dev)
> return -ENOMEM;
>
> indio_dev->buffer = buffer;
> - /* Effectively select the buffer implementation */
> - indio_dev->buffer->access = &lis3l02dq_access_funcs;
>
> buffer->scan_timestamp = true;
> indio_dev->setup_ops = &lis3l02dq_buffer_setup_ops;
> diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
> index dfeb4ba..654f7fb 100644
> --- a/drivers/staging/iio/adc/ad7192.c
> +++ b/drivers/staging/iio/adc/ad7192.c
> @@ -561,8 +561,6 @@ static int ad7192_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
> &ad7192_trigger_handler,
> IRQF_ONESHOT,
> diff --git a/drivers/staging/iio/adc/ad7298_ring.c b/drivers/staging/iio/adc/ad7298_ring.c
> index d1a12dd..feeb0ee 100644
> --- a/drivers/staging/iio/adc/ad7298_ring.c
> +++ b/drivers/staging/iio/adc/ad7298_ring.c
> @@ -131,9 +131,6 @@ int ad7298_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> -
> indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
> &ad7298_trigger_handler,
> IRQF_ONESHOT,
> diff --git a/drivers/staging/iio/adc/ad7476_ring.c b/drivers/staging/iio/adc/ad7476_ring.c
> index 4e298b2..35a8576 100644
> --- a/drivers/staging/iio/adc/ad7476_ring.c
> +++ b/drivers/staging/iio/adc/ad7476_ring.c
> @@ -98,8 +98,6 @@ int ad7476_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->pollfunc
> = iio_alloc_pollfunc(NULL,
> &ad7476_trigger_handler,
> diff --git a/drivers/staging/iio/adc/ad7606_ring.c b/drivers/staging/iio/adc/ad7606_ring.c
> index e8f94a1..1ef9fbc 100644
> --- a/drivers/staging/iio/adc/ad7606_ring.c
> +++ b/drivers/staging/iio/adc/ad7606_ring.c
> @@ -110,8 +110,6 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> goto error_ret;
> }
>
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh,
> &ad7606_trigger_handler_th_bh,
> 0,
> diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
> index accf325..fc9ebf1 100644
> --- a/drivers/staging/iio/adc/ad7793.c
> +++ b/drivers/staging/iio/adc/ad7793.c
> @@ -427,8 +427,6 @@ static int ad7793_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
> &ad7793_trigger_handler,
> IRQF_ONESHOT,
> diff --git a/drivers/staging/iio/adc/ad7887_ring.c b/drivers/staging/iio/adc/ad7887_ring.c
> index 85076cd..d180907 100644
> --- a/drivers/staging/iio/adc/ad7887_ring.c
> +++ b/drivers/staging/iio/adc/ad7887_ring.c
> @@ -131,8 +131,6 @@ int ad7887_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
> &ad7887_trigger_handler,
> IRQF_ONESHOT,
> diff --git a/drivers/staging/iio/adc/ad799x_ring.c b/drivers/staging/iio/adc/ad799x_ring.c
> index 5dded9e..28e9a41 100644
> --- a/drivers/staging/iio/adc/ad799x_ring.c
> +++ b/drivers/staging/iio/adc/ad799x_ring.c
> @@ -141,8 +141,6 @@ int ad799x_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_ret;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->pollfunc = iio_alloc_pollfunc(NULL,
> &ad799x_trigger_handler,
> IRQF_ONESHOT,
> diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c
> index f730b3f..d0a60a3 100644
> --- a/drivers/staging/iio/adc/max1363_ring.c
> +++ b/drivers/staging/iio/adc/max1363_ring.c
> @@ -116,8 +116,6 @@ int max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> ret = -ENOMEM;
> goto error_deallocate_sw_rb;
> }
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> /* Ring buffer functions - here trigger setup related */
> indio_dev->setup_ops = &max1363_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
> index 699a615..711f151 100644
> --- a/drivers/staging/iio/gyro/adis16260_ring.c
> +++ b/drivers/staging/iio/gyro/adis16260_ring.c
> @@ -115,8 +115,6 @@ int adis16260_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> - ring->access = &ring_sw_access_funcs;
> ring->scan_timestamp = true;
> indio_dev->setup_ops = &adis16260_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/iio_simple_dummy_buffer.c b/drivers/staging/iio/iio_simple_dummy_buffer.c
> index d6a1c0e..bb4daf7 100644
> --- a/drivers/staging/iio/iio_simple_dummy_buffer.c
> +++ b/drivers/staging/iio/iio_simple_dummy_buffer.c
> @@ -142,8 +142,6 @@ int iio_simple_dummy_configure_buffer(struct iio_dev *indio_dev)
> }
>
> indio_dev->buffer = buffer;
> - /* Tell the core how to access the buffer */
> - buffer->access = &kfifo_access_funcs;
>
> /* Enable timestamps by default */
> buffer->scan_timestamp = true;
> diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
> index f02d1c0..4138082 100644
> --- a/drivers/staging/iio/impedance-analyzer/ad5933.c
> +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
> @@ -607,9 +607,6 @@ static int ad5933_register_ring_funcs_and_init(struct iio_dev *indio_dev)
> if (!indio_dev->buffer)
> return -ENOMEM;
>
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> -
> /* Ring buffer functions - here trigger setup related */
> indio_dev->setup_ops = &ad5933_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
> index ac22de5..8daa038 100644
> --- a/drivers/staging/iio/imu/adis16400_ring.c
> +++ b/drivers/staging/iio/imu/adis16400_ring.c
> @@ -187,8 +187,6 @@ int adis16400_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
> indio_dev->buffer = ring;
> - /* Effectively select the ring buffer implementation */
> - ring->access = &ring_sw_access_funcs;
> ring->scan_timestamp = true;
> indio_dev->setup_ops = &adis16400_ring_setup_ops;
>
> diff --git a/drivers/staging/iio/kfifo_buf.c b/drivers/staging/iio/kfifo_buf.c
> index e1e9c06..9f3bd59 100644
> --- a/drivers/staging/iio/kfifo_buf.c
> +++ b/drivers/staging/iio/kfifo_buf.c
> @@ -59,21 +59,6 @@ static struct attribute_group iio_kfifo_attribute_group = {
> .name = "buffer",
> };
>
> -struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
> -{
> - struct iio_kfifo *kf;
> -
> - kf = kzalloc(sizeof *kf, GFP_KERNEL);
> - if (!kf)
> - return NULL;
> - kf->update_needed = true;
> - iio_buffer_init(&kf->buffer);
> - kf->buffer.attrs = &iio_kfifo_attribute_group;
> -
> - return &kf->buffer;
> -}
> -EXPORT_SYMBOL(iio_kfifo_allocate);
> -
> static int iio_get_bytes_per_datum_kfifo(struct iio_buffer *r)
> {
> return r->bytes_per_datum;
> @@ -104,12 +89,6 @@ static int iio_set_length_kfifo(struct iio_buffer *r, int length)
> return 0;
> }
>
> -void iio_kfifo_free(struct iio_buffer *r)
> -{
> - kfree(iio_to_kfifo(r));
> -}
> -EXPORT_SYMBOL(iio_kfifo_free);
> -
> static int iio_store_to_kfifo(struct iio_buffer *r,
> u8 *data,
> s64 timestamp)
> @@ -137,7 +116,7 @@ static int iio_read_first_n_kfifo(struct iio_buffer *r,
> return copied;
> }
>
> -const struct iio_buffer_access_funcs kfifo_access_funcs = {
> +static const struct iio_buffer_access_funcs kfifo_access_funcs = {
> .store_to = &iio_store_to_kfifo,
> .read_first_n = &iio_read_first_n_kfifo,
> .request_update = &iio_request_update_kfifo,
> @@ -146,6 +125,27 @@ const struct iio_buffer_access_funcs kfifo_access_funcs = {
> .get_length = &iio_get_length_kfifo,
> .set_length = &iio_set_length_kfifo,
> };
> -EXPORT_SYMBOL(kfifo_access_funcs);
> +
> +struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev)
> +{
> + struct iio_kfifo *kf;
> +
> + kf = kzalloc(sizeof *kf, GFP_KERNEL);
> + if (!kf)
> + return NULL;
> + kf->update_needed = true;
> + iio_buffer_init(&kf->buffer);
> + kf->buffer.attrs = &iio_kfifo_attribute_group;
> + kf->buffer.access = &kfifo_access_funcs;
> +
> + return &kf->buffer;
> +}
> +EXPORT_SYMBOL(iio_kfifo_allocate);
> +
> +void iio_kfifo_free(struct iio_buffer *r)
> +{
> + kfree(iio_to_kfifo(r));
> +}
> +EXPORT_SYMBOL(iio_kfifo_free);
>
> MODULE_LICENSE("GPL");
> diff --git a/drivers/staging/iio/kfifo_buf.h b/drivers/staging/iio/kfifo_buf.h
> index cc2bd9a..9f7da01 100644
> --- a/drivers/staging/iio/kfifo_buf.h
> +++ b/drivers/staging/iio/kfifo_buf.h
> @@ -3,8 +3,6 @@
> #include "iio.h"
> #include "buffer.h"
>
> -extern const struct iio_buffer_access_funcs kfifo_access_funcs;
> -
> struct iio_buffer *iio_kfifo_allocate(struct iio_dev *indio_dev);
> void iio_kfifo_free(struct iio_buffer *r);
>
> diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
> index f29f2b2..c5c522b 100644
> --- a/drivers/staging/iio/meter/ade7758_ring.c
> +++ b/drivers/staging/iio/meter/ade7758_ring.c
> @@ -144,8 +144,6 @@ int ade7758_configure_ring(struct iio_dev *indio_dev)
> return ret;
> }
>
> - /* Effectively select the ring buffer implementation */
> - indio_dev->buffer->access = &ring_sw_access_funcs;
> indio_dev->setup_ops = &ade7758_ring_setup_ops;
>
> indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,
> diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
> index 3e24ec4..94d77ce 100644
> --- a/drivers/staging/iio/ring_sw.c
> +++ b/drivers/staging/iio/ring_sw.c
> @@ -329,6 +329,16 @@ static struct attribute_group iio_ring_attribute_group = {
> .name = "buffer",
> };
>
> +static struct iio_buffer_access_funcs ring_sw_access_funcs = {
> + .store_to = &iio_store_to_sw_rb,
> + .read_first_n = &iio_read_first_n_sw_rb,
> + .request_update = &iio_request_update_sw_rb,
> + .get_bytes_per_datum = &iio_get_bytes_per_datum_sw_rb,
> + .set_bytes_per_datum = &iio_set_bytes_per_datum_sw_rb,
> + .get_length = &iio_get_length_sw_rb,
> + .set_length = &iio_set_length_sw_rb,
> +};
> +
> struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
> {
> struct iio_buffer *buf;
> @@ -341,6 +351,7 @@ struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
> buf = &ring->buf;
> iio_buffer_init(buf);
> buf->attrs = &iio_ring_attribute_group;
> + buf->access = &ring_sw_access_funcs;
>
> return buf;
> }
> @@ -352,16 +363,5 @@ void iio_sw_rb_free(struct iio_buffer *r)
> }
> EXPORT_SYMBOL(iio_sw_rb_free);
>
> -const struct iio_buffer_access_funcs ring_sw_access_funcs = {
> - .store_to = &iio_store_to_sw_rb,
> - .read_first_n = &iio_read_first_n_sw_rb,
> - .request_update = &iio_request_update_sw_rb,
> - .get_bytes_per_datum = &iio_get_bytes_per_datum_sw_rb,
> - .set_bytes_per_datum = &iio_set_bytes_per_datum_sw_rb,
> - .get_length = &iio_get_length_sw_rb,
> - .set_length = &iio_set_length_sw_rb,
> -};
> -EXPORT_SYMBOL(ring_sw_access_funcs);
> -
> MODULE_DESCRIPTION("Industrialio I/O software ring buffer");
> MODULE_LICENSE("GPL");
> diff --git a/drivers/staging/iio/ring_sw.h b/drivers/staging/iio/ring_sw.h
> index e6a6e2c..7556e21 100644
> --- a/drivers/staging/iio/ring_sw.h
> +++ b/drivers/staging/iio/ring_sw.h
> @@ -25,11 +25,6 @@
> #define _IIO_RING_SW_H_
> #include "buffer.h"
>
> -/**
> - * ring_sw_access_funcs - access functions for a software ring buffer
> - **/
> -extern const struct iio_buffer_access_funcs ring_sw_access_funcs;
> -
> struct iio_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev);
> void iio_sw_rb_free(struct iio_buffer *ring);
> #endif /* _IIO_RING_SW_H_ */
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
