diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-06-04 10:28:20 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-06-04 10:28:20 -0300 |
| commit | 7869e5889477e4e32e4024d665431b35e8b7b693 (patch) | |
| tree | bd1b6c00359ef7f26efc1f6b0ad9771a3d849f65 /include/linux | |
| parent | 9aae1780e7e81e54edfb70ba33ead5b0b48be009 (diff) | |
| parent | 4e9ae0d3d5bf4e2f1b466ba451bd18f2c5b69845 (diff) | |
| download | cachepc-linux-7869e5889477e4e32e4024d665431b35e8b7b693.tar.gz cachepc-linux-7869e5889477e4e32e4024d665431b35e8b7b693.zip | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iio/buffer_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/iio/buffer_impl.h b/include/linux/iio/buffer_impl.h index b9e22b7e2f28..d1171db23742 100644 --- a/include/linux/iio/buffer_impl.h +++ b/include/linux/iio/buffer_impl.h @@ -53,7 +53,7 @@ struct iio_buffer_access_funcs { int (*request_update)(struct iio_buffer *buffer); int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd); - int (*set_length)(struct iio_buffer *buffer, int length); + int (*set_length)(struct iio_buffer *buffer, unsigned int length); int (*enable)(struct iio_buffer *buffer, struct iio_dev *indio_dev); int (*disable)(struct iio_buffer *buffer, struct iio_dev *indio_dev); @@ -72,10 +72,10 @@ struct iio_buffer_access_funcs { */ struct iio_buffer { /** @length: Number of datums in buffer. */ - int length; + unsigned int length; /** @bytes_per_datum: Size of individual datum including timestamp. */ - int bytes_per_datum; + size_t bytes_per_datum; /** * @access: Buffer access functions associated with the |