On 05/11/2012 01:58 PM, Lars-Peter Clausen wrote:
> When calling adis16240_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@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx>
> ---
> drivers/staging/iio/accel/adis16240_ring.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
> index 1aa9566..f2d813b 100644
> --- a/drivers/staging/iio/accel/adis16240_ring.c
> +++ b/drivers/staging/iio/accel/adis16240_ring.c
> @@ -12,13 +12,12 @@
>
> /**
> * adis16240_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 adis16240_read_ring_data(struct device *dev, u8 *rx)
> +static int adis16240_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
> {
> struct spi_message msg;
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct adis16240_state *st = iio_priv(indio_dev);
> struct spi_transfer xfers[ADIS16240_OUTPUTS + 1];
> int ret;
> @@ -69,7 +68,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)
> }
>
> if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&
> - adis16240_read_ring_data(&indio_dev->dev, st->rx) >= 0)
> + adis16240_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]));
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
