| Message ID | 20250210-gpio-set-array-helper-v3-7-d6a673674da8@baylibre.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | gpiolib: add gpiod_multi_set_value_cansleep | expand |
On Mon, 10 Feb 2025 16:33:33 -0600 David Lechner <dlechner@baylibre.com> wrote: > Reduce verbosity by using gpiod_multi_set_value_cansleep() instead of > gpiod_set_array_value(). > > These are not called in an atomic context, so changing to the cansleep > variant is fine. > > Also drop unnecessary braces while we are at it. > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Signed-off-by: David Lechner <dlechner@baylibre.com> I've applied this to the IIO tree now but won't push out as anything other than testing until Bartosz has dropped it. (thanks for doing that btw!) Due to code movement it ends up being all in ad7606.c diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index 1e8b03a518b8..87908cc51e48 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -828,8 +828,7 @@ static int ad7606_write_os_hw(struct iio_dev *indio_dev, int val) values[0] = val & GENMASK(2, 0); - gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc, - st->gpio_os->info, values); + gpiod_multi_set_value_cansleep(st->gpio_os, values); /* AD7616 requires a reset to update value */ if (st->chip_info->os_req_reset) @@ -1260,10 +1259,9 @@ static int ad7606b_sw_mode_setup(struct iio_dev *indio_dev) * in the device tree, then they need to be set to high, * otherwise, they must be hardwired to VDD */ - if (st->gpio_os) { - gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc, - st->gpio_os->info, os); - } + if (st->gpio_os) + gpiod_multi_set_value_cansleep(st->gpio_os, os); + /* OS of 128 and 256 are available only in software mode */ st->oversampling_avail = ad7606b_oversampling_avail; st->num_os_ratios = ARRAY_SIZE(ad7606b_oversampling_avail); > --- > drivers/iio/adc/ad7606.c | 3 +-- > drivers/iio/adc/ad7606_spi.c | 7 +++---- > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c > index d8e3c7a43678c57470a5118715637a68b39125c1..9a124139924e4a4fbbbd234a8514eb77024442b3 100644 > --- a/drivers/iio/adc/ad7606.c > +++ b/drivers/iio/adc/ad7606.c > @@ -818,8 +818,7 @@ static int ad7606_write_os_hw(struct iio_dev *indio_dev, int val) > > values[0] = val & GENMASK(2, 0); > > - gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc, > - st->gpio_os->info, values); > + gpiod_multi_set_value_cansleep(st->gpio_os, values); > > /* AD7616 requires a reset to update value */ > if (st->chip_info->os_req_reset) > diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c > index e2c1475257065c98bf8e2512bda921d6d88a3002..091f31edb6604da3a8ec4d2d5328ac6550faa22c 100644 > --- a/drivers/iio/adc/ad7606_spi.c > +++ b/drivers/iio/adc/ad7606_spi.c > @@ -296,10 +296,9 @@ static int ad7606B_sw_mode_config(struct iio_dev *indio_dev) > * in the device tree, then they need to be set to high, > * otherwise, they must be hardwired to VDD > */ > - if (st->gpio_os) { > - gpiod_set_array_value(st->gpio_os->ndescs, > - st->gpio_os->desc, st->gpio_os->info, os); > - } > + if (st->gpio_os) > + gpiod_multi_set_value_cansleep(st->gpio_os, os); > + > /* OS of 128 and 256 are available only in software mode */ > st->oversampling_avail = ad7606B_oversampling_avail; > st->num_os_ratios = ARRAY_SIZE(ad7606B_oversampling_avail); >
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c index d8e3c7a43678c57470a5118715637a68b39125c1..9a124139924e4a4fbbbd234a8514eb77024442b3 100644 --- a/drivers/iio/adc/ad7606.c +++ b/drivers/iio/adc/ad7606.c @@ -818,8 +818,7 @@ static int ad7606_write_os_hw(struct iio_dev *indio_dev, int val) values[0] = val & GENMASK(2, 0); - gpiod_set_array_value(st->gpio_os->ndescs, st->gpio_os->desc, - st->gpio_os->info, values); + gpiod_multi_set_value_cansleep(st->gpio_os, values); /* AD7616 requires a reset to update value */ if (st->chip_info->os_req_reset) diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c index e2c1475257065c98bf8e2512bda921d6d88a3002..091f31edb6604da3a8ec4d2d5328ac6550faa22c 100644 --- a/drivers/iio/adc/ad7606_spi.c +++ b/drivers/iio/adc/ad7606_spi.c @@ -296,10 +296,9 @@ static int ad7606B_sw_mode_config(struct iio_dev *indio_dev) * in the device tree, then they need to be set to high, * otherwise, they must be hardwired to VDD */ - if (st->gpio_os) { - gpiod_set_array_value(st->gpio_os->ndescs, - st->gpio_os->desc, st->gpio_os->info, os); - } + if (st->gpio_os) + gpiod_multi_set_value_cansleep(st->gpio_os, os); + /* OS of 128 and 256 are available only in software mode */ st->oversampling_avail = ad7606B_oversampling_avail; st->num_os_ratios = ARRAY_SIZE(ad7606B_oversampling_avail);