[22/22] iio: proximity: sx_common: make use of iio_for_each_active_channel()

Commit Message

Nuno Sa via B4 Relay July 18, 2024, 1:38 p.m. UTC

From: Nuno Sa <[e-mail]>

Use iio_for_each_active_channel() to iterate over active channels
accessing '.masklength' so it can be annotated as __private when there are
no more direct users of it.

Signed-off-by: Nuno Sa <[e-mail]>
---
 drivers/iio/proximity/sx_common.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Jonathan Cameron July 20, 2024, 4:14 p.m. UTC | #1

On Thu, 18 Jul 2024 15:38:08 +0200
Nuno Sa via B4 Relay <[e-mail]> wrote:

> From: Nuno Sa <[e-mail]>
> 
> Use iio_for_each_active_channel() to iterate over active channels
> accessing '.masklength' so it can be annotated as __private when there are
> no more direct users of it.
> 
> Signed-off-by: Nuno Sa <[e-mail]>
I applied them all to the testing branch of iio.git which will be rebased on rc1
once available then pushed out as togreg for linux-next to pick up.

A few of the functions that got changes were pieces of nastiness that I'd long
banished from my mind so at least I got to look at those again :)
Datashuffling logic is 'fun'.


Thanks,

Jonathan

Patch

diff --git a/drivers/iio/proximity/sx_common.c b/drivers/iio/proximity/sx_common.c
index a95e9814aaf2..71aa6dced7d3 100644
--- a/drivers/iio/proximity/sx_common.c
+++ b/drivers/iio/proximity/sx_common.c
@@ -369,8 +369,7 @@  static irqreturn_t sx_common_trigger_handler(int irq, void *private)
 
 	mutex_lock(&data->mutex);
 
-	for_each_set_bit(bit, indio_dev->active_scan_mask,
-			 indio_dev->masklength) {
+	iio_for_each_active_channel(indio_dev, bit) {
 		ret = data->chip_info->ops.read_prox_data(data,
 						     &indio_dev->channels[bit],
 						     &val);
@@ -398,8 +397,7 @@  static int sx_common_buffer_preenable(struct iio_dev *indio_dev)
 	int bit, ret;
 
 	mutex_lock(&data->mutex);
-	for_each_set_bit(bit, indio_dev->active_scan_mask,
-			 indio_dev->masklength)
+	iio_for_each_active_channel(indio_dev, bit)
 		__set_bit(indio_dev->channels[bit].channel, &channels);
 
 	ret = sx_common_update_chan_en(data, channels, data->chan_event);