summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio/meter/ade7754.h
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@cam.ac.uk>2011-06-27 13:07:49 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-28 14:39:48 -0700
commit57157d1c0e73662401e0d32f501e54f2d80f4740 (patch)
tree3056574955edf5cdfb1487410abf1c6b8e1b981f /drivers/staging/iio/meter/ade7754.h
parentbfccd4fb9af3708eb7d117ca4fef60a650853fee (diff)
downloadop-kernel-dev-57157d1c0e73662401e0d32f501e54f2d80f4740.zip
op-kernel-dev-57157d1c0e73662401e0d32f501e54f2d80f4740.tar.gz
staging:iio:meter:ade7754: allocate state with iio_dev and buffers in state.
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/meter/ade7754.h')
-rw-r--r--drivers/staging/iio/meter/ade7754.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/iio/meter/ade7754.h b/drivers/staging/iio/meter/ade7754.h
index 0aa0522..6121125 100644
--- a/drivers/staging/iio/meter/ade7754.h
+++ b/drivers/staging/iio/meter/ade7754.h
@@ -78,17 +78,15 @@
/**
* struct ade7754_state - device instance specific data
* @us: actual spi_device
- * @indio_dev: industrial I/O device structure
+ * @buf_lock: mutex to protect tx and rx
* @tx: transmit buffer
* @rx: receive buffer
- * @buf_lock: mutex to protect tx and rx
**/
struct ade7754_state {
- struct spi_device *us;
- struct iio_dev *indio_dev;
- u8 *tx;
- u8 *rx;
- struct mutex buf_lock;
+ struct spi_device *us;
+ struct mutex buf_lock;
+ u8 tx[ADE7754_MAX_TX] ____cacheline_aligned;
+ u8 rx[ADE7754_MAX_RX];
};
#endif
OpenPOWER on IntegriCloud