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>
This commit is contained in:
		
					parent
					
						
							
								c7a22c3680
							
						
					
				
			
			
				commit
				
					
						5d65d92045
					
				
			
		
					 5 changed files with 13 additions and 13 deletions
				
			
		| 
						 | 
					@ -7,12 +7,12 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct iio_cb_buffer {
 | 
					struct iio_cb_buffer {
 | 
				
			||||||
	struct iio_buffer buffer;
 | 
						struct iio_buffer buffer;
 | 
				
			||||||
	int (*cb)(u8 *data, void *private);
 | 
						int (*cb)(const void *data, void *private);
 | 
				
			||||||
	void *private;
 | 
						void *private;
 | 
				
			||||||
	struct iio_channel *channels;
 | 
						struct iio_channel *channels;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int iio_buffer_cb_store_to(struct iio_buffer *buffer, u8 *data)
 | 
					static int iio_buffer_cb_store_to(struct iio_buffer *buffer, const void *data)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct iio_cb_buffer *cb_buff = container_of(buffer,
 | 
						struct iio_cb_buffer *cb_buff = container_of(buffer,
 | 
				
			||||||
						     struct iio_cb_buffer,
 | 
											     struct iio_cb_buffer,
 | 
				
			||||||
| 
						 | 
					@ -26,7 +26,7 @@ static const struct iio_buffer_access_funcs iio_cb_access = {
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
 | 
					struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
 | 
				
			||||||
					     int (*cb)(u8 *data,
 | 
										     int (*cb)(const void *data,
 | 
				
			||||||
						       void *private),
 | 
											       void *private),
 | 
				
			||||||
					     void *private)
 | 
										     void *private)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -769,8 +769,8 @@ struct iio_demux_table {
 | 
				
			||||||
	struct list_head l;
 | 
						struct list_head l;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static unsigned char *iio_demux(struct iio_buffer *buffer,
 | 
					static const void *iio_demux(struct iio_buffer *buffer,
 | 
				
			||||||
				 unsigned char *datain)
 | 
									 const void *datain)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct iio_demux_table *t;
 | 
						struct iio_demux_table *t;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -783,9 +783,9 @@ static unsigned char *iio_demux(struct iio_buffer *buffer,
 | 
				
			||||||
	return buffer->demux_bounce;
 | 
						return buffer->demux_bounce;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data)
 | 
					static int iio_push_to_buffer(struct iio_buffer *buffer, const void *data)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	unsigned char *dataout = iio_demux(buffer, data);
 | 
						const void *dataout = iio_demux(buffer, data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return buffer->access->store_to(buffer, dataout);
 | 
						return buffer->access->store_to(buffer, dataout);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -800,7 +800,7 @@ static void iio_buffer_demux_free(struct iio_buffer *buffer)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data)
 | 
					int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int ret;
 | 
						int ret;
 | 
				
			||||||
	struct iio_buffer *buf;
 | 
						struct iio_buffer *buf;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -95,7 +95,7 @@ static int iio_set_length_kfifo(struct iio_buffer *r, int length)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int iio_store_to_kfifo(struct iio_buffer *r,
 | 
					static int iio_store_to_kfifo(struct iio_buffer *r,
 | 
				
			||||||
			      u8 *data)
 | 
								      const void *data)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int ret;
 | 
						int ret;
 | 
				
			||||||
	struct iio_kfifo *kf = iio_to_kfifo(r);
 | 
						struct iio_kfifo *kf = iio_to_kfifo(r);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,7 +36,7 @@ struct iio_buffer;
 | 
				
			||||||
 * any of them not existing.
 | 
					 * any of them not existing.
 | 
				
			||||||
 **/
 | 
					 **/
 | 
				
			||||||
struct iio_buffer_access_funcs {
 | 
					struct iio_buffer_access_funcs {
 | 
				
			||||||
	int (*store_to)(struct iio_buffer *buffer, u8 *data);
 | 
						int (*store_to)(struct iio_buffer *buffer, const void *data);
 | 
				
			||||||
	int (*read_first_n)(struct iio_buffer *buffer,
 | 
						int (*read_first_n)(struct iio_buffer *buffer,
 | 
				
			||||||
			    size_t n,
 | 
								    size_t n,
 | 
				
			||||||
			    char __user *buf);
 | 
								    char __user *buf);
 | 
				
			||||||
| 
						 | 
					@ -81,7 +81,7 @@ struct iio_buffer {
 | 
				
			||||||
	bool					stufftoread;
 | 
						bool					stufftoread;
 | 
				
			||||||
	const struct attribute_group *attrs;
 | 
						const struct attribute_group *attrs;
 | 
				
			||||||
	struct list_head			demux_list;
 | 
						struct list_head			demux_list;
 | 
				
			||||||
	unsigned char				*demux_bounce;
 | 
						void					*demux_bounce;
 | 
				
			||||||
	struct list_head			buffer_list;
 | 
						struct list_head			buffer_list;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -120,7 +120,7 @@ int iio_scan_mask_set(struct iio_dev *indio_dev,
 | 
				
			||||||
 * @indio_dev:		iio_dev structure for device.
 | 
					 * @indio_dev:		iio_dev structure for device.
 | 
				
			||||||
 * @data:		Full scan.
 | 
					 * @data:		Full scan.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data);
 | 
					int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int iio_update_demux(struct iio_dev *indio_dev);
 | 
					int iio_update_demux(struct iio_dev *indio_dev);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -77,7 +77,7 @@ struct iio_cb_buffer;
 | 
				
			||||||
 * fail.
 | 
					 * fail.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
 | 
					struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
 | 
				
			||||||
					     int (*cb)(u8 *data,
 | 
										     int (*cb)(const void *data,
 | 
				
			||||||
						       void *private),
 | 
											       void *private),
 | 
				
			||||||
					     void *private);
 | 
										     void *private);
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue