UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging:iio:adis16204_read_ring_data: Pass IIO device directly 

When calling adis16204_read_ring_data we pass the device struct of embedded in
the IIO device only to look up the IIO device from the device struct again right
away. This patch changes the code to pass the IIO device directly.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lars-Peter Clausen 2012-05-12 15:39:35 +02:00 committed by Greg Kroah-Hartman
parent 8fa2c31507
commit ce7ea56c27
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/iio/accel/adis16204_ring.c
View File

@ -12,13 +12,12 @@
/** /**
* adis16204_read_ring_data() read data registers which will be placed into ring * adis16204_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 * @rx: somewhere to pass back the value read
**/ **/
static int adis16204_read_ring_data(struct device *dev, u8 *rx) static int adis16204_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
{ {
struct spi_message msg; struct spi_message msg;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16204_state *st = iio_priv(indio_dev); struct adis16204_state *st = iio_priv(indio_dev);
struct spi_transfer xfers[ADIS16204_OUTPUTS + 1]; struct spi_transfer xfers[ADIS16204_OUTPUTS + 1];
int ret; int ret;
@ -71,7 +70,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)
} }
if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) && if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
adis16204_read_ring_data(&indio_dev->dev, st->rx) >= 0) adis16204_read_ring_data(indio_dev, st->rx) >= 0)
for (; i < bitmap_weight(indio_dev->active_scan_mask, for (; i < bitmap_weight(indio_dev->active_scan_mask,
indio_dev->masklength); i++) indio_dev->masklength); i++)
data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2])); data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));