On 02/01/17 19:28, Jonathan Cameron wrote:
> This is a precursor to the splitting of buffer.h into parts relevant
> to buffer implementation vs those for devices using buffers.
> struct buffer is about to become opaque as far as the header is
> concerned.
>
> Signed-off-by: Jonathan Cameron <jic23@xxxxxxxxxx>
> ---
> drivers/iio/industrialio-buffer.c | 16 ++++++++++++++++
> include/linux/iio/buffer.h | 17 ++---------------
> 2 files changed, 18 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> index 0067e184c9ae..a04498231f94 100644
> --- a/drivers/iio/industrialio-buffer.c
> +++ b/drivers/iio/industrialio-buffer.c
> @@ -1445,3 +1445,19 @@ void iio_buffer_put(struct iio_buffer *buffer)
> kref_put(&buffer->ref, iio_buffer_release);
> }
> EXPORT_SYMBOL_GPL(iio_buffer_put);
> +
> +/**
> + * iio_device_attach_buffer - Attach a buffer to a IIO device
> + * @indio_dev: The device the buffer should be attached to
> + * @buffer: The buffer to attach to the device
> + *
> + * This function attaches a buffer to a IIO device. The buffer stays attached to
> + * the device until the device is freed. The function should only be called at
> + * most once per device.
> + */
> +void iio_device_attach_buffer(struct iio_dev *indio_dev,
> + struct iio_buffer *buffer)
> +{
> + indio_dev->buffer = iio_buffer_get(buffer);
> +}
> +EXPORT_SYMBOL_GPL(iio_device_attach_buffer);
> diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
> index 8c915c2c18f1..45a8d59e39cd 100644
> --- a/include/linux/iio/buffer.h
> +++ b/include/linux/iio/buffer.h
> @@ -194,26 +194,13 @@ bool iio_validate_scan_mask_onehot(struct iio_dev *indio_dev,
> struct iio_buffer *iio_buffer_get(struct iio_buffer *buffer);
> void iio_buffer_put(struct iio_buffer *buffer);
>
> -/**
> - * iio_device_attach_buffer - Attach a buffer to a IIO device
> - * @indio_dev: The device the buffer should be attached to
> - * @buffer: The buffer to attach to the device
> - *
> - * This function attaches a buffer to a IIO device. The buffer stays attached to
> - * the device until the device is freed. The function should only be called at
> - * most once per device.
> - */
> -static inline void iio_device_attach_buffer(struct iio_dev *indio_dev,
> - struct iio_buffer *buffer)
> -{
> - indio_dev->buffer = iio_buffer_get(buffer);
> -}
> -
> #else /* CONFIG_IIO_BUFFER */
>
> static inline void iio_buffer_get(struct iio_buffer *buffer) {}
> static inline void iio_buffer_put(struct iio_buffer *buffer) {}
>
> +void iio_device_attach_buffer(struct iio_dev *indio_dev,
> + struct iio_buffer *buffer);
Hmm. I made a mess of splitting up these changes into patches.
This should be in the other branch of the ifdef.
Fixed up.
> #endif /* CONFIG_IIO_BUFFER */
>
> #endif /* _IIO_BUFFER_GENERIC_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
