Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 550268ca authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

staging:iio: scrap scan_count and ensure all drivers use active_scan_mask 



Obviously drivers should only use this for pushing to buffers.
They need buffer->scan_mask for pulling from them post demux.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1612244f

drivers/staging/iio/accel/adis16201_ring.c

+5 −5
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) 
		return -ENOMEM;

	}



	if (ring->scan_count)

		if (adis16201_read_ring_data(indio_dev, st->rx) >= 0)

			for (; i < ring->scan_count; i++)

				data[i] = be16_to_cpup(

					(__be16 *)&(st->rx[i*2]));

	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength)

	    && adis16201_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]));



	/* Guaranteed to be aligned with 8 byte boundary */

	if (ring->scan_timestamp)

drivers/staging/iio/accel/adis16203_ring.c

+5 −5
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p) 
		return -ENOMEM;

	}



	if (ring->scan_count)

		if (adis16203_read_ring_data(&indio_dev->dev, st->rx) >= 0)

			for (; i < ring->scan_count; i++)

				data[i] = be16_to_cpup(

					(__be16 *)&(st->rx[i*2]));

	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&

	    adis16203_read_ring_data(&indio_dev->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]));



	/* Guaranteed to be aligned with 8 byte boundary */

	if (ring->scan_timestamp)

drivers/staging/iio/accel/adis16204_ring.c

+5 −5
Original line number Diff line number Diff line
@@ -71,11 +71,11 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p) 
		return -ENOMEM;

	}



	if (ring->scan_count)

		if (adis16204_read_ring_data(&indio_dev->dev, st->rx) >= 0)

			for (; i < ring->scan_count; i++)

				data[i] = be16_to_cpup(

					(__be16 *)&(st->rx[i*2]));

	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&

	    adis16204_read_ring_data(&indio_dev->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]));



	/* Guaranteed to be aligned with 8 byte boundary */

	if (ring->scan_timestamp)

drivers/staging/iio/accel/adis16209_ring.c

+3 −2
Original line number Diff line number Diff line
@@ -72,9 +72,10 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p) 
		return -ENOMEM;

	}



	if (ring->scan_count &&

	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&

	    adis16209_read_ring_data(&indio_dev->dev, st->rx) >= 0)

		for (; i < ring->scan_count; i++)

		for (; i < bitmap_weight(indio_dev->active_scan_mask,

					 indio_dev->masklength); i++)

			data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));



	/* Guaranteed to be aligned with 8 byte boundary */

drivers/staging/iio/accel/adis16240_ring.c

+3 −2
Original line number Diff line number Diff line
@@ -69,9 +69,10 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p) 
		return -ENOMEM;

	}



	if (ring->scan_count &&

	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&

	    adis16240_read_ring_data(&indio_dev->dev, st->rx) >= 0)

		for (; i < ring->scan_count; i++)

		for (; i < bitmap_weight(indio_dev->active_scan_mask,

					 indio_dev->masklength); i++)

			data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));



	/* Guaranteed to be aligned with 8 byte boundary */