[17/20] iio: adc: ad_sigma_delta: use new '.masklength' accessors

Commit Message

Nuno Sa via B4 Relay July 2, 2024, 4:02 p.m. UTC

From: Nuno Sa <[e-mail]>

Make use of iio_get_masklength) and iio_for_each_active_channel() to
access '.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/adc/ad_sigma_delta.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Alexandru Ardelean July 3, 2024, 6:41 a.m. UTC | #1

On Tue, Jul 2, 2024 at 7:03 PM Nuno Sa via B4 Relay
<[e-mail]> wrote:
>
> From: Nuno Sa <[e-mail]>
>
> Make use of iio_get_masklength) and iio_for_each_active_channel() to
> access '.masklength' so it can be annotated as __private when there
> are no more direct users of it.
>

Reviewed-by: Alexandru Ardelean <[e-mail]>

> Signed-off-by: Nuno Sa <[e-mail]>
> ---
>  drivers/iio/adc/ad_sigma_delta.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
> index a2b87f6b7a07..62653d7fe39b 100644
> --- a/drivers/iio/adc/ad_sigma_delta.c
> +++ b/drivers/iio/adc/ad_sigma_delta.c
> @@ -350,7 +350,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
>
>         if (sigma_delta->num_slots == 1) {
>                 channel = find_first_bit(indio_dev->active_scan_mask,
> -                                        indio_dev->masklength);
> +                                        iio_get_masklength(indio_dev));
>                 ret = ad_sigma_delta_set_channel(sigma_delta,
>                                                  indio_dev->channels[channel].address);
>                 if (ret)
> @@ -363,7 +363,7 @@ static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
>                  * implementation is mandatory.
>                  */
>                 slot = 0;
> -               for_each_set_bit(i, indio_dev->active_scan_mask, indio_dev->masklength) {
> +               iio_for_each_active_channel(indio_dev, i) {
>                         sigma_delta->slots[slot] = indio_dev->channels[i].address;
>                         slot++;
>                 }
> @@ -525,7 +525,7 @@ static bool ad_sd_validate_scan_mask(struct iio_dev *indio_dev, const unsigned l
>  {
>         struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);
>
> -       return bitmap_weight(mask, indio_dev->masklength) <= sigma_delta->num_slots;
> +       return bitmap_weight(mask, iio_get_masklength(indio_dev)) <= sigma_delta->num_slots;
>  }
>
>  static const struct iio_buffer_setup_ops ad_sd_buffer_setup_ops = {
>
> --
> 2.45.2
>
>
>

Patch

diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c
index a2b87f6b7a07..62653d7fe39b 100644
--- a/drivers/iio/adc/ad_sigma_delta.c
+++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -350,7 +350,7 @@  static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
 
 	if (sigma_delta->num_slots == 1) {
 		channel = find_first_bit(indio_dev->active_scan_mask,
-					 indio_dev->masklength);
+					 iio_get_masklength(indio_dev));
 		ret = ad_sigma_delta_set_channel(sigma_delta,
 						 indio_dev->channels[channel].address);
 		if (ret)
@@ -363,7 +363,7 @@  static int ad_sd_buffer_postenable(struct iio_dev *indio_dev)
 		 * implementation is mandatory.
 		 */
 		slot = 0;
-		for_each_set_bit(i, indio_dev->active_scan_mask, indio_dev->masklength) {
+		iio_for_each_active_channel(indio_dev, i) {
 			sigma_delta->slots[slot] = indio_dev->channels[i].address;
 			slot++;
 		}
@@ -525,7 +525,7 @@  static bool ad_sd_validate_scan_mask(struct iio_dev *indio_dev, const unsigned l
 {
 	struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);
 
-	return bitmap_weight(mask, indio_dev->masklength) <= sigma_delta->num_slots;
+	return bitmap_weight(mask, iio_get_masklength(indio_dev)) <= sigma_delta->num_slots;
 }
 
 static const struct iio_buffer_setup_ops ad_sd_buffer_setup_ops = {