From 54fd84760dcaa2903348d98cf6fa6867649981b4 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 12 May 2012 15:39:40 +0200 Subject: [PATCH] --- yaml --- r: 304673 b: refs/heads/master c: 2a0b871c4fee4405772428ac6178adce30c41abf h: refs/heads/master i: 304671: 31114b475c46780790ee7646e4eb3cc3639392be v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/meter/ade7758_ring.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f4cde277756f..e64915d47a42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48f29345cee22a4dfaf384ab3bbb8ba14f92b6a9 +refs/heads/master: 2a0b871c4fee4405772428ac6178adce30c41abf diff --git a/trunk/drivers/staging/iio/meter/ade7758_ring.c b/trunk/drivers/staging/iio/meter/ade7758_ring.c index 7b9be8a2cc50..92159f208d14 100644 --- a/trunk/drivers/staging/iio/meter/ade7758_ring.c +++ b/trunk/drivers/staging/iio/meter/ade7758_ring.c @@ -19,11 +19,10 @@ /** * ade7758_spi_read_burst() - read data registers - * @dev: device associated with child of actual device (iio_dev or iio_trig) + * @indio_dev: the IIO device **/ -static int ade7758_spi_read_burst(struct device *dev) +static int ade7758_spi_read_burst(struct iio_dev *indio_dev) { - struct iio_dev *indio_dev = dev_get_drvdata(dev); struct ade7758_state *st = iio_priv(indio_dev); int ret; @@ -68,7 +67,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) u32 *dat32 = (u32 *)dat64; if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)) - if (ade7758_spi_read_burst(&indio_dev->dev) >= 0) + if (ade7758_spi_read_burst(indio_dev) >= 0) *dat32 = get_unaligned_be32(&st->rx_buf[5]) & 0xFFFFFF; /* Guaranteed to be aligned with 8 byte boundary */