diff --git a/[refs] b/[refs] index 342a9b854c73..8721f8b7d0e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 872e79add7561645b130fba63aa7ca12098a9361 +refs/heads/master: 999517f6742b4ca4692c041752afc4298fbbf0da diff --git a/trunk/drivers/iio/kfifo_buf.c b/trunk/drivers/iio/kfifo_buf.c index 5bc5c860e9ca..a923c78d5cb4 100644 --- a/trunk/drivers/iio/kfifo_buf.c +++ b/trunk/drivers/iio/kfifo_buf.c @@ -22,7 +22,6 @@ static inline int __iio_allocate_kfifo(struct iio_kfifo *buf, if ((length == 0) || (bytes_per_datum == 0)) return -EINVAL; - __iio_update_buffer(&buf->buffer, bytes_per_datum, length); return __kfifo_alloc((struct __kfifo *)&buf->kf, length, bytes_per_datum, GFP_KERNEL); } diff --git a/trunk/include/linux/iio/buffer.h b/trunk/include/linux/iio/buffer.h index f3eea18fdf46..2bac0eb8948d 100644 --- a/trunk/include/linux/iio/buffer.h +++ b/trunk/include/linux/iio/buffer.h @@ -103,19 +103,6 @@ int iio_update_buffers(struct iio_dev *indio_dev, **/ void iio_buffer_init(struct iio_buffer *buffer); -/** - * __iio_update_buffer() - update common elements of buffers - * @buffer: buffer that is the event source - * @bytes_per_datum: size of individual datum including timestamp - * @length: number of datums in buffer - **/ -static inline void __iio_update_buffer(struct iio_buffer *buffer, - int bytes_per_datum, int length) -{ - buffer->bytes_per_datum = bytes_per_datum; - buffer->length = length; -} - int iio_scan_mask_query(struct iio_dev *indio_dev, struct iio_buffer *buffer, int bit);