Commit c15c4f1d authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:buffer drop bpe field.

Has no remaining users.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bc234e72
...@@ -116,7 +116,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) ...@@ -116,7 +116,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
} }
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->setup_ops = &adis16201_ring_setup_ops; ring->setup_ops = &adis16201_ring_setup_ops;
......
...@@ -118,7 +118,6 @@ int adis16203_configure_ring(struct iio_dev *indio_dev) ...@@ -118,7 +118,6 @@ int adis16203_configure_ring(struct iio_dev *indio_dev)
} }
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->setup_ops = &adis16203_ring_setup_ops; ring->setup_ops = &adis16203_ring_setup_ops;
......
...@@ -114,7 +114,6 @@ int adis16204_configure_ring(struct iio_dev *indio_dev) ...@@ -114,7 +114,6 @@ int adis16204_configure_ring(struct iio_dev *indio_dev)
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->setup_ops = &adis16204_ring_setup_ops; ring->setup_ops = &adis16204_ring_setup_ops;
ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
......
...@@ -114,7 +114,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) ...@@ -114,7 +114,6 @@ int adis16209_configure_ring(struct iio_dev *indio_dev)
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->setup_ops = &adis16209_ring_setup_ops; ring->setup_ops = &adis16209_ring_setup_ops;
ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
......
...@@ -111,7 +111,6 @@ int adis16240_configure_ring(struct iio_dev *indio_dev) ...@@ -111,7 +111,6 @@ int adis16240_configure_ring(struct iio_dev *indio_dev)
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->setup_ops = &adis16240_ring_setup_ops; ring->setup_ops = &adis16240_ring_setup_ops;
ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
......
...@@ -436,7 +436,6 @@ int lis3l02dq_configure_buffer(struct iio_dev *indio_dev) ...@@ -436,7 +436,6 @@ int lis3l02dq_configure_buffer(struct iio_dev *indio_dev)
indio_dev->buffer = buffer; indio_dev->buffer = buffer;
/* Effectively select the buffer implementation */ /* Effectively select the buffer implementation */
indio_dev->buffer->access = &lis3l02dq_access_funcs; indio_dev->buffer->access = &lis3l02dq_access_funcs;
buffer->bpe = 2;
buffer->scan_timestamp = true; buffer->scan_timestamp = true;
buffer->setup_ops = &lis3l02dq_buffer_setup_ops; buffer->setup_ops = &lis3l02dq_buffer_setup_ops;
......
...@@ -146,7 +146,6 @@ static int sca3000_ring_get_bytes_per_datum(struct iio_buffer *r) ...@@ -146,7 +146,6 @@ static int sca3000_ring_get_bytes_per_datum(struct iio_buffer *r)
} }
static IIO_BUFFER_ENABLE_ATTR; static IIO_BUFFER_ENABLE_ATTR;
static IIO_BUFFER_BYTES_PER_DATUM_ATTR;
static IIO_BUFFER_LENGTH_ATTR; static IIO_BUFFER_LENGTH_ATTR;
/** /**
...@@ -243,7 +242,6 @@ static IIO_DEVICE_ATTR(in_accel_scale, ...@@ -243,7 +242,6 @@ static IIO_DEVICE_ATTR(in_accel_scale,
*/ */
static struct attribute *sca3000_ring_attributes[] = { static struct attribute *sca3000_ring_attributes[] = {
&dev_attr_length.attr, &dev_attr_length.attr,
&dev_attr_bytes_per_datum.attr,
&dev_attr_enable.attr, &dev_attr_enable.attr,
&iio_dev_attr_50_percent.dev_attr.attr, &iio_dev_attr_50_percent.dev_attr.attr,
&iio_dev_attr_75_percent.dev_attr.attr, &iio_dev_attr_75_percent.dev_attr.attr,
......
...@@ -136,8 +136,6 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev) ...@@ -136,8 +136,6 @@ int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev)
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
indio_dev->buffer->access = &ring_sw_access_funcs; indio_dev->buffer->access = &ring_sw_access_funcs;
indio_dev->buffer->bpe =
st->chip_info->channels[0].scan_type.storagebits / 8;
indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh, indio_dev->pollfunc = iio_alloc_pollfunc(&ad7606_trigger_handler_th_bh,
&ad7606_trigger_handler_th_bh, &ad7606_trigger_handler_th_bh,
0, 0,
......
...@@ -86,7 +86,6 @@ struct iio_buffer_setup_ops { ...@@ -86,7 +86,6 @@ struct iio_buffer_setup_ops {
* @owner: module that owns the buffer (for ref counting) * @owner: module that owns the buffer (for ref counting)
* @length: [DEVICE] number of datums in buffer * @length: [DEVICE] number of datums in buffer
* @bytes_per_datum: [DEVICE] size of individual datum including timestamp * @bytes_per_datum: [DEVICE] size of individual datum including timestamp
* @bpe: [DEVICE] size of individual channel value
* @scan_el_attrs: [DRIVER] control of scan elements if that scan mode * @scan_el_attrs: [DRIVER] control of scan elements if that scan mode
* control method is used * control method is used
* @scan_count: [INTERN] the number of elements in the current scan mode * @scan_count: [INTERN] the number of elements in the current scan mode
...@@ -103,7 +102,6 @@ struct iio_buffer { ...@@ -103,7 +102,6 @@ struct iio_buffer {
struct module *owner; struct module *owner;
int length; int length;
int bytes_per_datum; int bytes_per_datum;
int bpe;
struct attribute_group *scan_el_attrs; struct attribute_group *scan_el_attrs;
int scan_count; int scan_count;
long *scan_mask; long *scan_mask;
......
...@@ -116,7 +116,6 @@ int adis16260_configure_ring(struct iio_dev *indio_dev) ...@@ -116,7 +116,6 @@ int adis16260_configure_ring(struct iio_dev *indio_dev)
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->setup_ops = &adis16260_ring_setup_ops; ring->setup_ops = &adis16260_ring_setup_ops;
ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
......
...@@ -142,8 +142,6 @@ int iio_simple_dummy_configure_buffer(struct iio_dev *indio_dev) ...@@ -142,8 +142,6 @@ int iio_simple_dummy_configure_buffer(struct iio_dev *indio_dev)
/* Tell the core how to access the buffer */ /* Tell the core how to access the buffer */
buffer->access = &kfifo_access_funcs; buffer->access = &kfifo_access_funcs;
/* Number of bytes per element */
buffer->bpe = 2;
/* Enable timestamps by default */ /* Enable timestamps by default */
buffer->scan_timestamp = true; buffer->scan_timestamp = true;
......
...@@ -186,7 +186,6 @@ int adis16400_configure_ring(struct iio_dev *indio_dev) ...@@ -186,7 +186,6 @@ int adis16400_configure_ring(struct iio_dev *indio_dev)
indio_dev->buffer = ring; indio_dev->buffer = ring;
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
ring->access = &ring_sw_access_funcs; ring->access = &ring_sw_access_funcs;
ring->bpe = 2;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->setup_ops = &adis16400_ring_setup_ops; ring->setup_ops = &adis16400_ring_setup_ops;
ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment