diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-09-15 12:50:00 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-15 14:02:07 -0400 |
commit | 5d65d92045cb7d3b2c45020c0e62d6d1c1d34f37 (patch) | |
tree | a996bac655ff390d6331d82f6121c6b7aab7bbdf /include/linux/iio | |
parent | c7a22c36805b015fd220f9fd13d0a14207d556e0 (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 'include/linux/iio')
-rw-r--r-- | include/linux/iio/buffer.h | 6 | ||||
-rw-r--r-- | include/linux/iio/consumer.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h index 2bac0eb8948d..e5507e999ed1 100644 --- a/include/linux/iio/buffer.h +++ b/include/linux/iio/buffer.h | |||
@@ -36,7 +36,7 @@ struct iio_buffer; | |||
36 | * any of them not existing. | 36 | * any of them not existing. |
37 | **/ | 37 | **/ |
38 | struct iio_buffer_access_funcs { | 38 | struct iio_buffer_access_funcs { |
39 | int (*store_to)(struct iio_buffer *buffer, u8 *data); | 39 | int (*store_to)(struct iio_buffer *buffer, const void *data); |
40 | int (*read_first_n)(struct iio_buffer *buffer, | 40 | int (*read_first_n)(struct iio_buffer *buffer, |
41 | size_t n, | 41 | size_t n, |
42 | char __user *buf); | 42 | char __user *buf); |
@@ -81,7 +81,7 @@ struct iio_buffer { | |||
81 | bool stufftoread; | 81 | bool stufftoread; |
82 | const struct attribute_group *attrs; | 82 | const struct attribute_group *attrs; |
83 | struct list_head demux_list; | 83 | struct list_head demux_list; |
84 | unsigned char *demux_bounce; | 84 | void *demux_bounce; |
85 | struct list_head buffer_list; | 85 | struct list_head buffer_list; |
86 | }; | 86 | }; |
87 | 87 | ||
@@ -120,7 +120,7 @@ int iio_scan_mask_set(struct iio_dev *indio_dev, | |||
120 | * @indio_dev: iio_dev structure for device. | 120 | * @indio_dev: iio_dev structure for device. |
121 | * @data: Full scan. | 121 | * @data: Full scan. |
122 | */ | 122 | */ |
123 | int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data); | 123 | int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data); |
124 | 124 | ||
125 | int iio_update_demux(struct iio_dev *indio_dev); | 125 | int iio_update_demux(struct iio_dev *indio_dev); |
126 | 126 | ||
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h index 833926c91aa8..2752b1fd12be 100644 --- a/include/linux/iio/consumer.h +++ b/include/linux/iio/consumer.h | |||
@@ -77,7 +77,7 @@ struct iio_cb_buffer; | |||
77 | * fail. | 77 | * fail. |
78 | */ | 78 | */ |
79 | struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, | 79 | struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev, |
80 | int (*cb)(u8 *data, | 80 | int (*cb)(const void *data, |
81 | void *private), | 81 | void *private), |
82 | void *private); | 82 | void *private); |
83 | /** | 83 | /** |