iio: chemical: scd30: Replace manual locking with RAII locking
Subsystems (2)
PATCH v6 1/1 iio: chemical: scd30: Replace manual locking with RAII locking
scd30_core.c currently uses manual mutex_lock() and mutex_unlock() calls. Replace them with the newer guard(mutex)() for cleaner RAII patterns and to improve maintainability.
Add new helper function scd30_trigger_handler_helper() containing the critical section for scd30_trigger_handler().
In addition, small refactor to replace "?:" operator with regular if/else returns.
---
v2:
- Fix callback issue as noted by Jonathan v1.
- Refactor critical section of scd30_trigger_handler() into helper called scd30_trigger_handler_helper_locked().
- Revert removal of goto in scd30_trigger_handler().
v3:
- Tune up helper to return early on failure condition per Jonathan's suggestion.
v4:
- Forgot to commit changes listed in v3, now fixed.
v5:
- Remove unneeded comment for scd30_trigger_handler_helper() per Jonathan's suggestion.
- Change name of arr_size to scan_data_size per Jonathan's suggestion.
- Change type of scan_data_size to size_t per Jonathan's suggestion.
- Added blank line between return and the rest of the function body in
scd30_trigger_handler_helper().
v6:
- Fix issue where names for scd30_trigger_handler_helper() did not match per Jonathan.
drivers/iio/chemical/scd30_core.c | 66 ++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 24 deletions(-)
drivers/iio/chemical/scd30_core.c +42 -24
@@ -368,11 +368,13 @@ static ssize_t calibration_auto_enable_show(struct device *dev, struct device_atint ret;u16 val; -mutex_lock (&state->lock); - ret =scd30_command_read (state,CMD_ASC , &val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock); -return ret ?:sysfs_emit (buf,"%d\n" , val); + ret =scd30_command_read (state,CMD_ASC , &val); +if (ret) +return ret; + +return sysfs_emit (buf,"%d\n" , val); } static ssize_t calibration_auto_enable_store(struct device *dev, struct device_attribute *attr,
@@ -387,11 +389,13 @@ static ssize_t calibration_auto_enable_store(struct device *dev, struct device_aif (ret)return ret; -mutex_lock (&state->lock); - ret =scd30_command_write (state,CMD_ASC , val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock); -return ret ?: len; + ret =scd30_command_write (state,CMD_ASC , val); +if (ret) +return ret; + +return len; } static ssize_t calibration_forced_value_show(struct device *dev, struct device_attribute *attr,
@@ -402,11 +406,13 @@ static ssize_t calibration_forced_value_show(struct device *dev, struct device_aint ret;u16 val; -mutex_lock (&state->lock); - ret =scd30_command_read (state,CMD_FRC , &val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock); -return ret ?:sysfs_emit (buf,"%d\n" , val); + ret =scd30_command_read (state,CMD_FRC , &val); +if (ret) +return ret; + +return sysfs_emit (buf,"%d\n" , val); } static ssize_t calibration_forced_value_store(struct device *dev, struct device_attribute *attr,
@@ -424,11 +430,13 @@ static ssize_t calibration_forced_value_store(struct device *dev, struct device_if (val <SCD30_FRC_MIN_PPM || val >SCD30_FRC_MAX_PPM )return -EINVAL ; -mutex_lock (&state->lock); - ret =scd30_command_write (state,CMD_FRC , val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock); -return ret ?: len; + ret =scd30_command_write (state,CMD_FRC , val); +if (ret) +return ret; + +return len; } static IIO_DEVICE_ATTR_RO(sampling_frequency_available, 0);
@@ -579,24 +587,34 @@ static irqreturn_t scd30_irq_thread_handler(int irq, void *priv)return IRQ_HANDLED ; } +static int scd30_trigger_handler_helper (struct iio_dev *indio_dev,int *scan_data, +size_t scan_data_size) +{ +struct scd30_state *state =iio_priv (indio_dev); +int ret; + +guard (mutex)(&state->lock); + +if (!iio_trigger_using_own (indio_dev)) + ret =scd30_read_poll (state); +else + ret =scd30_read_meas (state); +memcpy (scan_data, state->meas, scan_data_size); + +return ret; +} +static irqreturn_t scd30_trigger_handler (int irq,void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -struct scd30_state *state =iio_priv (indio_dev);struct {int data[SCD30_MEAS_COUNT ];aligned_s64 ts; } scan = { };int ret; -mutex_lock (&state->lock); -if (!iio_trigger_using_own (indio_dev)) - ret =scd30_read_poll (state); -else - ret =scd30_read_meas (state); -memcpy (scan.data, state->meas,sizeof (state->meas)); -mutex_unlock (&state->lock); + ret =scd30_trigger_handler_helper (indio_dev, scan.data,sizeof (scan.data));if (ret) goto out;
Signature · 1 line
2.54.0
Quoted 32 lines · Maxwell Doose
scd30_core.ccurrently uses manualmutex_lock()andmutex_unlock()calls. Replace them with the newer guard(mutex)() for cleaner RAII patterns and to improve maintainability.Add new helper function
scd30_trigger_handler_helper()containing the critical section forscd30_trigger_handler().In addition, small refactor to replace "?:" operator with regular if/else returns.
Signed-off-by Maxwell Doose <[email protected]>---
v2:
- Fix callback issue as noted by Jonathan v1.
- Refactor critical section ofscd30_trigger_handler()into helper calledscd30_trigger_handler_helper_locked().
- Revert removal of goto inscd30_trigger_handler().v3:
- Tune up helper to return early on failure condition per Jonathan's suggestion.v4:
- Forgot to commit changes listed in v3, now fixed.v5:
- Remove unneeded comment forscd30_trigger_handler_helper()per Jonathan's suggestion.
- Change name ofarr_sizetoscan_data_sizeper Jonathan's suggestion.
- Change type ofscan_data_sizetosize_tper Jonathan's suggestion.
- Added blank line between return and the rest of the function body in
Quoted 8 lines
scd30_trigger_handler_helper().v6:
- Fix issue where names forscd30_trigger_handler_helper()did not match per Jonathan.drivers/iio/chemical/scd30_core.c | 66 ++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 24 deletions(-)
FWIW,
Signature · 3 lines
Kind regards CJD
Quoted 3 lines
scd30_core.ccurrently uses manualmutex_lock()andmutex_unlock()calls. Replace them with the newer guard(mutex)() for cleaner RAII patterns and to improve maintainability.
…
Quoted 2 lines
In addition, small refactor to replace "?:" operator with regular if/else returns.
How does such an information fit to a known patch requirement?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.1-rc5#n81
…
drivers/iio/chemical/scd30_core.c static ssize_t calibration_auto_enable_show(struct device *dev, struct device_at · line 375
Quoted 11 lines
+++
b/drivers/iio/chemical/scd30_core.cdrivers/iio/chemical/scd30_core.c +1
-4@@ -368,11 +368,13 @@ static ssize_t calibration_auto_enable_show(struct device *dev, struct device_atint ret;u16 val; -mutex_lock (&state->lock); - ret =scd30_command_read (state,CMD_ASC , &val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock); -return ret ?:sysfs_emit (buf,"%d\n" , val);
…
How do you think about to preserve lock scopes by using scoped_guard() calls?
Regards,
Markus
Hi Markus,
Quoted 10 lines · On Mon, 1 Jun 2026 17:38:44 +0200 Markus Elfring <[email protected]> wrote:
Quoted 3 lines
scd30_core.ccurrently uses manualmutex_lock()andmutex_unlock()calls. Replace them with the newer guard(mutex)() for cleaner RAII patterns and to improve maintainability.…
Quoted 2 lines
In addition, small refactor to replace "?:" operator with regular if/else returns.
How does such an information fit to a known patch requirement?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.1-rc5#n81
Good point. However, I think that it's such a small change that nobody is going to care that much. We'll see what Jonathan has to say, I suppose.
Quoted 12 lines
…
Quoted 10 lines
+++
b/drivers/iio/chemical/scd30_core.cdrivers/iio/chemical/scd30_core.c +1
-3@@ -368,11 +368,13 @@ static ssize_t calibration_auto_enable_show(struct device *dev, struct device_atint ret;u16 val; -mutex_lock (&state->lock); - ret =scd30_command_read (state,CMD_ASC , &val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock);
Quoted 5 lines
Review static ssize_t calibration_auto_enable_show(struct device *dev, struct device_at · line 375
Quoted 1 line
(quoted diff) +0
-1- return ret ?: sysfs_emit(buf, "%d\n", val);…
How do you think about to preserve lock scopes by using
scoped_guard()calls?
Generally scoped_guard() (at least in my experience in iio) is frowned upon because of the hidden for loop that can make normal things (e.g., break, continue) really weird, plus guard()() with {} is also (in my experience) more popular over scoped_guard(). In the past helpers have also been liked over both as well.
Signature · 2 lines
best regards, max
Quoted 7 lines · Maxwell Doose
Quoted 3 lines
How does such an information fit to a known patch requirement?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v7.1-rc5#n81Good point. However, I think that it's such a small change that nobody is going to care that much. We'll see what Jonathan has to say, I suppose.
Considering the patch went through six iterations without anyone mentioning this, I'd say this point is moot.
Signature · 3 lines
Kind regards CJD
Quoted 2 lines · Maxwell Doose
On Mon, 1 Jun 2026 17:38:44 +0200
Markus Elfring <[email protected]> wrote:
…
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
drivers/iio/chemical/scd30_core.c +1
-4-mutex_lock (&state->lock); - ret =scd30_command_read (state,CMD_ASC , &val); -mutex_unlock (&state->lock); +guard (mutex)(&state->lock); -return ret ?:sysfs_emit (buf,"%d\n" , val);…
Quoted 7 lines
Quoted 1 line
How do you think about to preserve lock scopes by using
scoped_guard()calls?Generally
scoped_guard()(at least in my experience in iio) is frowned upon because of the hidden for loop that can make normal things (e.g., break, continue) really weird, plus guard()() with {} is also (in my experience) more popular overscoped_guard(). In the past helpers have also been liked over both as well.
This is a slow path and printing under the lock can actually narrow the window for value to change which means that it increases the chance the user gets actual value and not the stale one.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 11 lines · On Sun, 31 May 2026 18:38:28 -0500 Maxwell Doose <[email protected]> wrote:
scd30_core.ccurrently uses manualmutex_lock()andmutex_unlock()calls. Replace them with the newer guard(mutex)() for cleaner RAII patterns and to improve maintainability.Add new helper function
scd30_trigger_handler_helper()containing the critical section forscd30_trigger_handler().In addition, small refactor to replace "?:" operator with regular if/else returns.
Signed-off-by Maxwell Doose <[email protected]>
Applied. Thanks,
J