From b395790e0ef3c395a44c156ba68e115c6ab03ff8 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 12 May 2012 15:39:34 +0200 Subject: [PATCH] --- yaml --- r: 304667 b: refs/heads/master c: 8fa2c315077787356bb7417d63e5a87b85f296a0 h: refs/heads/master i: 304665: 7a92de92b3433ca26b88389626622854a8a37d62 304663: f124ee37ca661a40fa54b1465da0516e62bc31ac v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/adis16203_ring.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a128f27bf2c5..25fa8a47b787 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e53f5ac52ec19c8c606aeacdd13fed2a03d7365a +refs/heads/master: 8fa2c315077787356bb7417d63e5a87b85f296a0 diff --git a/trunk/drivers/staging/iio/accel/adis16203_ring.c b/trunk/drivers/staging/iio/accel/adis16203_ring.c index 2171f7483e71..7bbd2c2bbd19 100644 --- a/trunk/drivers/staging/iio/accel/adis16203_ring.c +++ b/trunk/drivers/staging/iio/accel/adis16203_ring.c @@ -12,13 +12,12 @@ /** * adis16203_read_ring_data() read data registers which will be placed into ring - * @dev: device associated with child of actual device (iio_dev or iio_trig) + * @indio_dev: the IIO device * @rx: somewhere to pass back the value read **/ -static int adis16203_read_ring_data(struct device *dev, u8 *rx) +static int adis16203_read_ring_data(struct iio_dev *indio_dev, u8 *rx) { struct spi_message msg; - struct iio_dev *indio_dev = dev_get_drvdata(dev); struct adis16203_state *st = iio_priv(indio_dev); struct spi_transfer xfers[ADIS16203_OUTPUTS + 1]; int ret; @@ -74,7 +73,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) } if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) && - adis16203_read_ring_data(&indio_dev->dev, st->rx) >= 0) + adis16203_read_ring_data(indio_dev, st->rx) >= 0) for (; i < bitmap_weight(indio_dev->active_scan_mask, indio_dev->masklength); i++) data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));