Merge Linux 3.0-rc6 into staging-next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / iio / accel / adis16204.h

diff --git a/drivers/staging/iio/accel/adis16204.h b/drivers/staging/iio/accel/adis16204.h
index 1690c0d15690d13e5c4340f1ca5f93ca59b3aa4b..3bb0490465f4ae8f782a88e6aa6ba8bf589e35b7 100644 (file)
--- a/drivers/staging/iio/accel/adis16204.h
+++ b/drivers/staging/iio/accel/adis16204.h
@@ -67,19 +67,17 @@
 /**
  * struct adis16204_state - device instance specific data
  * @us:                        actual spi_device
- * @indio_dev:         industrial I/O device structure
  * @trig:              data ready trigger registered with iio
  * @tx:                        transmit buffer
  * @rx:                        receive buffer
  * @buf_lock:          mutex to protect tx and rx
  **/
 struct adis16204_state {
-       struct spi_device               *us;
-       struct iio_dev                  *indio_dev;
-       struct iio_trigger              *trig;
-       u8                              *tx;
-       u8                              *rx;
-       struct mutex                    buf_lock;
+       struct spi_device       *us;
+       struct iio_trigger      *trig;
+       struct mutex            buf_lock;
+       u8                      tx[ADIS16204_MAX_TX] ____cacheline_aligned;
+       u8                      rx[ADIS16204_MAX_RX];
 };
 
 int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);