aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/industrialio-buffer.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-09-15 12:50:00 -0400
committerJonathan Cameron <jic23@kernel.org>2013-09-15 14:02:07 -0400
commit5d65d92045cb7d3b2c45020c0e62d6d1c1d34f37 (patch)
treea996bac655ff390d6331d82f6121c6b7aab7bbdf /drivers/iio/industrialio-buffer.c
parentc7a22c36805b015fd220f9fd13d0a14207d556e0 (diff)
iio: iio_push_to_buffers(): Change type of 'data' to const void *
Change the type of the 'data' parameter for iio_push_to_buffers() from 'u8 *' to 'const void *'. Drivers typically use the correct type (e.g. __be16 *) for their data buffer. When passing the buffer to iio_push_to_buffers() it needs to be cast to 'u8 *' for the compiler to not complain (and also having to add __force if we want to keep sparse happy as well). Since the buffer implementation should not care about the data layout (except the size of one sample) using a void pointer is the correct thing to do. Also make it const as the buffer implementations are not supposed to modify it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/industrialio-buffer.c')
-rw-r--r--drivers/iio/industrialio-buffer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 7ea2edbf7614..a7ac4b5af03e 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -769,8 +769,8 @@ struct iio_demux_table {
769 struct list_head l; 769 struct list_head l;
770}; 770};
771 771
772static unsigned char *iio_demux(struct iio_buffer *buffer, 772static const void *iio_demux(struct iio_buffer *buffer,
773 unsigned char *datain) 773 const void *datain)
774{ 774{
775 struct iio_demux_table *t; 775 struct iio_demux_table *t;
776 776
@@ -783,9 +783,9 @@ static unsigned char *iio_demux(struct iio_buffer *buffer,
783 return buffer->demux_bounce; 783 return buffer->demux_bounce;
784} 784}
785 785
786static int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data) 786static int iio_push_to_buffer(struct iio_buffer *buffer, const void *data)
787{ 787{
788 unsigned char *dataout = iio_demux(buffer, data); 788 const void *dataout = iio_demux(buffer, data);
789 789
790 return buffer->access->store_to(buffer, dataout); 790 return buffer->access->store_to(buffer, dataout);
791} 791}
@@ -800,7 +800,7 @@ static void iio_buffer_demux_free(struct iio_buffer *buffer)
800} 800}
801 801
802 802
803int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data) 803int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data)
804{ 804{
805 int ret; 805 int ret;
806 struct iio_buffer *buf; 806 struct iio_buffer *buf;