From faf386801440bdd47dee407290bb3311e52628fa Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 12 May 2012 15:39:36 +0200 Subject: [PATCH] --- yaml --- r: 304669 b: refs/heads/master c: 0fbf0a15f9efd9b7dd5e49619718b6b51f3ce093 h: refs/heads/master i: 304667: b395790e0ef3c395a44c156ba68e115c6ab03ff8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/accel/adis16209_ring.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8a09a5362d75..fc443b8d5a86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce7ea56c270451820cfcc0c96aa6a73516b061ee +refs/heads/master: 0fbf0a15f9efd9b7dd5e49619718b6b51f3ce093 diff --git a/trunk/drivers/staging/iio/accel/adis16209_ring.c b/trunk/drivers/staging/iio/accel/adis16209_ring.c index f7ed989dd20c..090607504c93 100644 --- a/trunk/drivers/staging/iio/accel/adis16209_ring.c +++ b/trunk/drivers/staging/iio/accel/adis16209_ring.c @@ -12,13 +12,12 @@ /** * adis16209_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 adis16209_read_ring_data(struct device *dev, u8 *rx) +static int adis16209_read_ring_data(struct iio_dev *indio_dev, u8 *rx) { struct spi_message msg; - struct iio_dev *indio_dev = dev_get_drvdata(dev); struct adis16209_state *st = iio_priv(indio_dev); struct spi_transfer xfers[ADIS16209_OUTPUTS + 1]; int ret; @@ -71,7 +70,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p) } if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) && - adis16209_read_ring_data(&indio_dev->dev, st->rx) >= 0) + adis16209_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]));