diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2011-05-18 14:42:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:15:05 -0700 |
| commit | a3f02370c9fa6d85fbee2c11649ebc9c84bae919 (patch) | |
| tree | 137f547f29e7f5e5954e5d82174b91bcebe8dca6 /drivers/staging/iio/meter/ade7758_ring.c | |
| parent | 7df86302f4258764a3b8b1d63848dab3aa292654 (diff) | |
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_ring.c')
| -rw-r--r-- | drivers/staging/iio/meter/ade7758_ring.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c index 564555a81191..a5e48c1bd424 100644 --- a/drivers/staging/iio/meter/ade7758_ring.c +++ b/drivers/staging/iio/meter/ade7758_ring.c @@ -32,7 +32,7 @@ static int ade7758_spi_read_burst(struct device *dev) { struct iio_dev *indio_dev = dev_get_drvdata(dev); - struct ade7758_state *st = iio_dev_get_devdata(indio_dev); + struct ade7758_state *st = iio_priv(indio_dev); int ret; ret = spi_sync(st->us, &st->ring_msg); @@ -71,12 +71,12 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->private_data; struct iio_ring_buffer *ring = indio_dev->ring; - struct ade7758_state *st = iio_dev_get_devdata(indio_dev); + struct ade7758_state *st = iio_priv(indio_dev); s64 dat64[2]; u32 *dat32 = (u32 *)dat64; if (ring->scan_count) - if (ade7758_spi_read_burst(&st->indio_dev->dev) >= 0) + if (ade7758_spi_read_burst(&indio_dev->dev) >= 0) *dat32 = get_unaligned_be32(&st->rx_buf[5]) & 0xFFFFFF; /* Guaranteed to be aligned with 8 byte boundary */ @@ -85,7 +85,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) ring->access->store_to(ring, (u8 *)dat64, pf->timestamp); - iio_trigger_notify_done(st->indio_dev->trig); + iio_trigger_notify_done(indio_dev->trig); return IRQ_HANDLED; } @@ -99,7 +99,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) **/ static int ade7758_ring_preenable(struct iio_dev *indio_dev) { - struct ade7758_state *st = indio_dev->dev_data; + struct ade7758_state *st = iio_priv(indio_dev); struct iio_ring_buffer *ring = indio_dev->ring; size_t d_size; unsigned channel; @@ -149,7 +149,7 @@ void ade7758_unconfigure_ring(struct iio_dev *indio_dev) int ade7758_configure_ring(struct iio_dev *indio_dev) { - struct ade7758_state *st = indio_dev->dev_data; + struct ade7758_state *st = iio_priv(indio_dev); int ret = 0; indio_dev->ring = iio_sw_rb_allocate(indio_dev); |