diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-06-27 08:07:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-28 17:39:35 -0400 |
commit | 35212dfa6b13ab9a53f919d9ef22dd6ed363d485 (patch) | |
tree | a11ccbfcbff7ab62c66b66a9ea9a2e00f563848b /drivers/staging/iio/accel/adis16209.h | |
parent | 4de66bbb3eb1099a76e1bbf87e376c7a31dc30d5 (diff) |
staging:iio:accel:adis16209 allocate tx and rx in state plus state via iio_priv
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/accel/adis16209.h')
-rw-r--r-- | drivers/staging/iio/accel/adis16209.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/iio/accel/adis16209.h b/drivers/staging/iio/accel/adis16209.h index 58d08db6f9b..1b2a7272786 100644 --- a/drivers/staging/iio/accel/adis16209.h +++ b/drivers/staging/iio/accel/adis16209.h | |||
@@ -104,19 +104,17 @@ | |||
104 | /** | 104 | /** |
105 | * struct adis16209_state - device instance specific data | 105 | * struct adis16209_state - device instance specific data |
106 | * @us: actual spi_device | 106 | * @us: actual spi_device |
107 | * @indio_dev: industrial I/O device structure | ||
108 | * @trig: data ready trigger registered with iio | 107 | * @trig: data ready trigger registered with iio |
109 | * @tx: transmit buffer | 108 | * @tx: transmit buffer |
110 | * @rx: receive buffer | 109 | * @rx: receive buffer |
111 | * @buf_lock: mutex to protect tx and rx | 110 | * @buf_lock: mutex to protect tx and rx |
112 | **/ | 111 | **/ |
113 | struct adis16209_state { | 112 | struct adis16209_state { |
114 | struct spi_device *us; | 113 | struct spi_device *us; |
115 | struct iio_dev *indio_dev; | 114 | struct iio_trigger *trig; |
116 | struct iio_trigger *trig; | 115 | struct mutex buf_lock; |
117 | u8 *tx; | 116 | u8 tx[ADIS16209_MAX_TX] ____cacheline_aligned; |
118 | u8 *rx; | 117 | u8 rx[ADIS16209_MAX_RX]; |
119 | struct mutex buf_lock; | ||
120 | }; | 118 | }; |
121 | 119 | ||
122 | int adis16209_set_irq(struct iio_dev *indio_dev, bool enable); | 120 | int adis16209_set_irq(struct iio_dev *indio_dev, bool enable); |