summaryrefslogtreecommitdiff
path: root/drivers/staging/iio/meter/ade7758.h
diff options
context:
space:
mode:
authorMichael Hennerich <michael.hennerich@analog.com>2011-05-18 13:42:36 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-19 23:15:05 (GMT)
commita3f02370c9fa6d85fbee2c11649ebc9c84bae919 (patch)
tree137f547f29e7f5e5954e5d82174b91bcebe8dca6 /drivers/staging/iio/meter/ade7758.h
parent7df86302f4258764a3b8b1d63848dab3aa292654 (diff)
downloadlinux-fsl-qoriq-a3f02370c9fa6d85fbee2c11649ebc9c84bae919.tar.xz
staging:iio:meter:ade7758: Use private data space from iio_allocate_device
Use private data space from iio_allocate_device. Drop dev_data in favor of iio_priv(). Fix indention issues from previous patches. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/meter/ade7758.h')
-rw-r--r--drivers/staging/iio/meter/ade7758.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h
index 372a9f6..fd74e15 100644
--- a/drivers/staging/iio/meter/ade7758.h
+++ b/drivers/staging/iio/meter/ade7758.h
@@ -111,7 +111,6 @@
/**
* struct ade7758_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
@@ -119,21 +118,20 @@
**/
struct ade7758_state {
struct spi_device *us;
- struct iio_dev *indio_dev;
struct iio_trigger *trig;
u8 *tx;
u8 *rx;
struct mutex buf_lock;
u32 available_scan_masks[AD7758_NUM_WAVESRC];
struct iio_chan_spec *ade7758_ring_channels;
- struct spi_transfer ring_xfer[4];
- struct spi_message ring_msg;
+ struct spi_transfer ring_xfer[4];
+ struct spi_message ring_msg;
/*
* DMA (thus cache coherency maintenance) requires the
* transfer buffers to live in their own cache lines.
*/
- unsigned char rx_buf[8] ____cacheline_aligned;
- unsigned char tx_buf[8];
+ unsigned char rx_buf[8] ____cacheline_aligned;
+ unsigned char tx_buf[8];
};
#ifdef CONFIG_IIO_RING_BUFFER