iio: adc: rtq6056: Use automated cleanup for mode handling in write_raw
PATCH 1/1 iio: adc: rtq6056: Use automated cleanup for mode handling in write_raw
Using iio_device_claim_direct_scoped() to automate mode claim and release simplifies code flow and allows for straight-forward error handling with direct returns on errors.
--- drivers/iio/adc/rtq6056.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)
drivers/iio/adc/rtq6056.c +11 -23
@@ -520,32 +520,20 @@ static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, {struct rtq6056_priv *priv =iio_priv (indio_dev);const struct richtek_dev_data *devdata = priv->devdata; -int ret; - ret =iio_device_claim_direct_mode (indio_dev); -if (ret) -return ret; - -switch (mask) { -case IIO_CHAN_INFO_SAMP_FREQ : -if (devdata->fixed_samp_freq) { - ret = -EINVAL ; -break ; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +if (devdata->fixed_samp_freq) +return -EINVAL ; +return rtq6056_adc_set_samp_freq (priv, chan, val); +case IIO_CHAN_INFO_OVERSAMPLING_RATIO : +return devdata->set_average (priv, val); +default : +return -EINVAL ; } - - ret =rtq6056_adc_set_samp_freq (priv, chan, val); -break ; -case IIO_CHAN_INFO_OVERSAMPLING_RATIO : - ret = devdata->set_average (priv, val); -break ; -default : - ret = -EINVAL ; -break ; } - -iio_device_release_direct_mode (indio_dev); - -return ret; +unreachable (); }static const char *rtq6056_channel_labels[RTQ6056_MAX_CHANNEL ] = {
Signature · 1 line
2.44.0
Hi Gabriel,
Nice patch!
Quoted 61 lines · Gabriel Schwartz
Using
iio_device_claim_direct_scoped()to automate mode claim and release simplifies code flow and allows for straight-forward error handling with direct returns on errors.Signed-off-by Gabriel Schwartz <[email protected]>--- drivers/iio/adc/rtq6056.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)drivers/iio/adc/rtq6056.c +11
-23@@ -520,32 +520,20 @@ static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, {struct rtq6056_priv *priv =iio_priv (indio_dev);const struct richtek_dev_data *devdata = priv->devdata; -int ret; - ret =iio_device_claim_direct_mode (indio_dev); -if (ret) -return ret; - -switch (mask) { -case IIO_CHAN_INFO_SAMP_FREQ : -if (devdata->fixed_samp_freq) { - ret = -EINVAL ; -break ; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +if (devdata->fixed_samp_freq) +return -EINVAL ; +return rtq6056_adc_set_samp_freq (priv, chan, val); +case IIO_CHAN_INFO_OVERSAMPLING_RATIO : +return devdata->set_average (priv, val); +default : +return -EINVAL ; } - - ret =rtq6056_adc_set_samp_freq (priv, chan, val); -break ; -case IIO_CHAN_INFO_OVERSAMPLING_RATIO : - ret = devdata->set_average (priv, val); -break ; -default : - ret = -EINVAL ; -break ; } - -iio_device_release_direct_mode (indio_dev); - -return ret; +unreachable (); }static const char *rtq6056_channel_labels[RTQ6056_MAX_CHANNEL ] = {Signature · 1 line
2.44.0
Jonathan Cameron
maintainerQuoted 5 lines · On Fri, 26 Apr 2024 17:01:14 -0300 Gabriel Schwartz <[email protected]> wrote:
Using
iio_device_claim_direct_scoped()to automate mode claim and release simplifies code flow and allows for straight-forward error handling with direct returns on errors.Signed-off-by Gabriel Schwartz <[email protected]>
+CC driver author. This is a fairly recent driver, so like they are still around.
Patch looks good so I'll apply it but if ChiYuan Huang gives a review that would be great.
Thanks,
Jonathan
Quoted 52 lines
--- drivers/iio/adc/rtq6056.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)drivers/iio/adc/rtq6056.c +11
-23@@ -520,32 +520,20 @@ static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, {struct rtq6056_priv *priv =iio_priv (indio_dev);const struct richtek_dev_data *devdata = priv->devdata; -int ret; - ret =iio_device_claim_direct_mode (indio_dev); -if (ret) -return ret; - -switch (mask) { -case IIO_CHAN_INFO_SAMP_FREQ : -if (devdata->fixed_samp_freq) { - ret = -EINVAL ; -break ; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +if (devdata->fixed_samp_freq) +return -EINVAL ; +return rtq6056_adc_set_samp_freq (priv, chan, val); +case IIO_CHAN_INFO_OVERSAMPLING_RATIO : +return devdata->set_average (priv, val); +default : +return -EINVAL ; } - - ret =rtq6056_adc_set_samp_freq (priv, chan, val); -break ; -case IIO_CHAN_INFO_OVERSAMPLING_RATIO : - ret = devdata->set_average (priv, val); -break ; -default : - ret = -EINVAL ; -break ; } - -iio_device_release_direct_mode (indio_dev); - -return ret; +unreachable (); }static const char *rtq6056_channel_labels[RTQ6056_MAX_CHANNEL ] = {
ChiYuan Huang
Reviewed-byQuoted 8 lines · Jonathan Cameron
Quoted 5 lines · On Fri, 26 Apr 2024 17:01:14 -0300 Gabriel Schwartz <[email protected]> wrote:
Using
iio_device_claim_direct_scoped()to automate mode claim and release simplifies code flow and allows for straight-forward error handling with direct returns on errors.Signed-off-by Gabriel Schwartz <[email protected]>
Hi,
Patch looks good. Thanks.
Quoted 64 lines
+CC driver author. This is a fairly recent driver, so like they are still around.
Patch looks good so I'll apply it but if ChiYuan Huang gives a review that would be great.
Thanks,
Jonathan
Quoted 52 lines
--- drivers/iio/adc/rtq6056.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)drivers/iio/adc/rtq6056.c +11
-23@@ -520,32 +520,20 @@ static int rtq6056_adc_write_raw(struct iio_dev *indio_dev, {struct rtq6056_priv *priv =iio_priv (indio_dev);const struct richtek_dev_data *devdata = priv->devdata; -int ret; - ret =iio_device_claim_direct_mode (indio_dev); -if (ret) -return ret; - -switch (mask) { -case IIO_CHAN_INFO_SAMP_FREQ : -if (devdata->fixed_samp_freq) { - ret = -EINVAL ; -break ; + iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +if (devdata->fixed_samp_freq) +return -EINVAL ; +return rtq6056_adc_set_samp_freq (priv, chan, val); +case IIO_CHAN_INFO_OVERSAMPLING_RATIO : +return devdata->set_average (priv, val); +default : +return -EINVAL ; } - - ret =rtq6056_adc_set_samp_freq (priv, chan, val); -break ; -case IIO_CHAN_INFO_OVERSAMPLING_RATIO : - ret = devdata->set_average (priv, val); -break ; -default : - ret = -EINVAL ; -break ; } - -iio_device_release_direct_mode (indio_dev); - -return ret; +unreachable (); }static const char *rtq6056_channel_labels[RTQ6056_MAX_CHANNEL ] = {