History

Merge tag 'staging-4.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull IIO driver fixes from Greg KH: "Here are some old IIO driver fixes that were sitting in my tree for a few weeks. Sorry about not getting them to you sooner. They fix a number of small IIO driver issues that have been reported. All of these have been in linux-next for a while with no reported problems" * tag 'staging-4.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: iio: adc: select buffer for at91-sama5d2_adc iio: hid-sensor-trigger: Fix sometimes not powering up the sensor after resume iio: adc: at91-sama5d2_adc: fix channel configuration for differential channels iio:kfifo_buf: check for uint overflow iio:buffer: make length types match kfifo types iio: adc: stm32-dfsdm: fix sample rate for div2 spi clock iio: adc: stm32-dfsdm: fix successive oversampling settings iio: ad7793: implement IIO_CHAN_INFO_SAMP_FREQ

Linus Torvalds committed 8 years ago

Commit 34a8e642 parents 7fdf3e8 9d569b18 files · +93 −68Browse files

Showing the changes to include/linux (1 of 8 files). Show all

Unified · Split

include/linux/iio/buffer_impl.h+3−3
@@ -53,7 +53,7 @@ struct iio_buffer_access_funcs { · 52 unmodified lines
53 int (*request_update)(struct iio_buffer *buffer);53 int (*request_update)(struct iio_buffer *buffer);
54 54
55 int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);55 int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);
56 int (*set_length)(struct iio_buffer *buffer, int length);56 int (*set_length)(struct iio_buffer *buffer, unsigned int length);
57 57
58 int (*enable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);58 int (*enable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);
59 int (*disable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);59 int (*disable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);
@@ -72,10 +72,10 @@ struct iio_buffer_access_funcs { · 12 unmodified lines
72 */72 */
73struct iio_buffer {73struct iio_buffer {
74 /** @length: Number of datums in buffer. */74 /** @length: Number of datums in buffer. */
75 int length;75 unsigned int length;
76 76
77 /** @bytes_per_datum: Size of individual datum including timestamp. */77 /** @bytes_per_datum: Size of individual datum including timestamp. */
78 int bytes_per_datum;78 size_t bytes_per_datum;
79 79
80 /**80 /**
81 * @access: Buffer access functions associated with the81 * @access: Buffer access functions associated with the