From 30e53a35b8ac470a09e33d7dc8b854254c432bbe Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 12 May 2012 15:39:39 +0200 Subject: [PATCH] --- yaml --- r: 304672 b: refs/heads/master c: 48f29345cee22a4dfaf384ab3bbb8ba14f92b6a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/gyro/adis16260_ring.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9d5428278aa8..f4cde277756f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8dc5afd8cb9b9a1253fdaa4e25d3ac1dccca6319 +refs/heads/master: 48f29345cee22a4dfaf384ab3bbb8ba14f92b6a9 diff --git a/trunk/drivers/staging/iio/gyro/adis16260_ring.c b/trunk/drivers/staging/iio/gyro/adis16260_ring.c index 25283376f2fc..0fe2d9dfb6cd 100644 --- a/trunk/drivers/staging/iio/gyro/adis16260_ring.c +++ b/trunk/drivers/staging/iio/gyro/adis16260_ring.c @@ -12,13 +12,12 @@ /** * adis16260_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 adis16260_read_ring_data(struct device *dev, u8 *rx) +static int adis16260_read_ring_data(struct iio_dev *indio_dev, u8 *rx) { struct spi_message msg; - struct iio_dev *indio_dev = dev_get_drvdata(dev); struct adis16260_state *st = iio_priv(indio_dev); struct spi_transfer xfers[ADIS16260_OUTPUTS + 1]; int ret; @@ -74,7 +73,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p) } if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) && - adis16260_read_ring_data(&indio_dev->dev, st->rx) >= 0) + adis16260_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]));