| Message ID | 20250310-iio-adc-ad4030-check-scan-type-err-v1-3-589e4ebd9711@baylibre.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | iio: adc: ad4030: scan_type cleanups | expand |
On Mon, 2025-03-10 at 15:43 -0500, David Lechner wrote: > Move calling ad4030_set_mode() from the buffer preenable callback to > the update_scan_mode callback. This doesn't change any functionality > but is more logical since setting the mode is a function of the scan > mask and doesn't require an "undo" operation when the buffer is > disabled. > > Signed-off-by: David Lechner <dlechner@baylibre.com> > --- Reviewed-by: Nuno Sá <nuno.sa@analog.com> > drivers/iio/adc/ad4030.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/drivers/iio/adc/ad4030.c b/drivers/iio/adc/ad4030.c > index > f24b46164a477f9b6b5c93ffeba0a335f7b3de5a..c2117c7a296f22aeeec6911c8a8c74ed5762 > 96a0 100644 > --- a/drivers/iio/adc/ad4030.c > +++ b/drivers/iio/adc/ad4030.c > @@ -868,6 +868,12 @@ static int ad4030_get_current_scan_type(const struct > iio_dev *indio_dev, > return st->avg_log2 ? AD4030_SCAN_TYPE_AVG : AD4030_SCAN_TYPE_NORMAL; > } > > +static int ad4030_update_scan_mode(struct iio_dev *indio_dev, > + const unsigned long *scan_mask) > +{ > + return ad4030_set_mode(indio_dev, *scan_mask); > +} > + > static const struct iio_info ad4030_iio_info = { > .read_avail = ad4030_read_avail, > .read_raw = ad4030_read_raw, > @@ -875,13 +881,9 @@ static const struct iio_info ad4030_iio_info = { > .debugfs_reg_access = ad4030_reg_access, > .read_label = ad4030_read_label, > .get_current_scan_type = ad4030_get_current_scan_type, > + .update_scan_mode = ad4030_update_scan_mode, > }; > > -static int ad4030_buffer_preenable(struct iio_dev *indio_dev) > -{ > - return ad4030_set_mode(indio_dev, *indio_dev->active_scan_mask); > -} > - > static bool ad4030_validate_scan_mask(struct iio_dev *indio_dev, > const unsigned long *scan_mask) > { > @@ -895,7 +897,6 @@ static bool ad4030_validate_scan_mask(struct iio_dev > *indio_dev, > } > > static const struct iio_buffer_setup_ops ad4030_buffer_setup_ops = { > - .preenable = ad4030_buffer_preenable, > .validate_scan_mask = ad4030_validate_scan_mask, > }; > >
diff --git a/drivers/iio/adc/ad4030.c b/drivers/iio/adc/ad4030.c index f24b46164a477f9b6b5c93ffeba0a335f7b3de5a..c2117c7a296f22aeeec6911c8a8c74ed576296a0 100644 --- a/drivers/iio/adc/ad4030.c +++ b/drivers/iio/adc/ad4030.c @@ -868,6 +868,12 @@ static int ad4030_get_current_scan_type(const struct iio_dev *indio_dev, return st->avg_log2 ? AD4030_SCAN_TYPE_AVG : AD4030_SCAN_TYPE_NORMAL; } +static int ad4030_update_scan_mode(struct iio_dev *indio_dev, + const unsigned long *scan_mask) +{ + return ad4030_set_mode(indio_dev, *scan_mask); +} + static const struct iio_info ad4030_iio_info = { .read_avail = ad4030_read_avail, .read_raw = ad4030_read_raw, @@ -875,13 +881,9 @@ static const struct iio_info ad4030_iio_info = { .debugfs_reg_access = ad4030_reg_access, .read_label = ad4030_read_label, .get_current_scan_type = ad4030_get_current_scan_type, + .update_scan_mode = ad4030_update_scan_mode, }; -static int ad4030_buffer_preenable(struct iio_dev *indio_dev) -{ - return ad4030_set_mode(indio_dev, *indio_dev->active_scan_mask); -} - static bool ad4030_validate_scan_mask(struct iio_dev *indio_dev, const unsigned long *scan_mask) { @@ -895,7 +897,6 @@ static bool ad4030_validate_scan_mask(struct iio_dev *indio_dev, } static const struct iio_buffer_setup_ops ad4030_buffer_setup_ops = { - .preenable = ad4030_buffer_preenable, .validate_scan_mask = ad4030_validate_scan_mask, };
Move calling ad4030_set_mode() from the buffer preenable callback to the update_scan_mode callback. This doesn't change any functionality but is more logical since setting the mode is a function of the scan mask and doesn't require an "undo" operation when the buffer is disabled. Signed-off-by: David Lechner <dlechner@baylibre.com> --- drivers/iio/adc/ad4030.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)