staging: iio: frequency: ad9834: use guard() for mutex locking
Subsystems (4)
PATCH 1/1 staging: iio: frequency: ad9834: use guard() for mutex locking
Replace manual mutex_lock()/mutex_unlock() pairs with guard(mutex) in ad9834_write() and ad9834_store_wavetype(). The mutex is now released automatically when each function returns, removing the need for explicit unlock calls.
--- drivers/staging/iio/frequency/ad9834.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/staging/iio/frequency/ad9834.c +3 -4
@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/err.h> #include <linux/module.h> +#include <linux/mutex.h> #include <asm/div64.h> #include <linux/iio/iio.h>
@@ -152,7 +153,7 @@ static ssize_t ad9834_write(struct device *dev,if (ret)return ret; -mutex_lock (&st->lock); +guard (mutex)(&st->lock);switch ((u32 )this_attr->address) {case AD9834_REG_FREQ0 :case AD9834_REG_FREQ1 :
@@ -210,7 +211,6 @@ static ssize_t ad9834_write(struct device *dev,default : ret = -ENODEV ; } -mutex_unlock (&st->lock);return ret ? ret : len; }
@@ -226,7 +226,7 @@ static ssize_t ad9834_store_wavetype(struct device *dev,int ret =0 ;bool is_ad9833_7 = (st->devid ==ID_AD9833 ) || (st->devid ==ID_AD9837 ); -mutex_lock (&st->lock); +guard (mutex)(&st->lock);switch ((u32 )this_attr->address) {case 0 :
@@ -269,7 +269,6 @@ static ssize_t ad9834_store_wavetype(struct device *dev, st->data =cpu_to_be16 (AD9834_REG_CMD | st->control); ret =spi_sync (st->spi, &st->msg); } -mutex_unlock (&st->lock);return ret ? ret : len; }
Signature · 1 line
2.53.0
drivers/staging/iio/frequency/ad9834.c line 21
Quoted 6 lines · On Thu, 25 Jun 2026 15:04:55 +0300 Batu Ada Tutkun <[email protected]>…
drivers/staging/iio/frequency/ad9834.c +1
-0@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/err.h> #include <linux/module.h> +#include <linux/mutex.h> #include <asm/div64.h>
You're definitely developing against an old tree - this won't apply cleanly :( Please update your branch.
drivers/staging/iio/frequency/ad9834.c static ssize_t ad9834_write(struct device *dev, · line 156
Quoted 7 lines
drivers/staging/iio/frequency/ad9834.c +1
-1#include <linux/iio/iio.h> @@ -152,7 +153,7 @@ static ssize_t ad9834_write(struct device *dev,if (ret)return ret; -mutex_lock (&st->lock); +guard (mutex)(&st->lock);
Blank line here.
Quoted 1 line
(quoted diff) +0
-0switch ((u32)this_attr->address) {
Signature · 3 lines
Kind regards CJD
Greg Kroah-Hartman
maintainerQuoted 4 lines · Batu Ada Tutkun
Replace manual mutex_lock()/mutex_unlock() pairs with guard(mutex) in
ad9834_write()andad9834_store_wavetype(). The mutex is now released automatically when each function returns, removing the need for explicit unlock calls.
You only need to do this for new code, no need to change existing code unless you are fixing a bug by using guard().
thanks,
greg k-h
Jonathan Cameron
maintainerQuoted 6 lines · On Thu, 25 Jun 2026 15:04:55 +0300 Batu Ada Tutkun <[email protected]>…
Replace manual mutex_lock()/mutex_unlock() pairs with guard(mutex) in
ad9834_write()andad9834_store_wavetype(). The mutex is now released automatically when each function returns, removing the need for explicit unlock calls.Signed-off-by Batu Ada Tutkun <[email protected]>
Whilst we aren't taking this forwards, a few comments inline for future reference.
drivers/staging/iio/frequency/ad9834.c line 20
Quoted 13 lines
--- drivers/staging/iio/frequency/ad9834.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)drivers/staging/iio/frequency/ad9834.c +1
-0@@ -17,6 +17,7 @@#include <linux/regulator/consumer.h> #include <linux/err.h> #include <linux/module.h> +#include <linux/mutex.h>
I'm guessing cleanup.h is missing as well. You should have both when guard(mutex) is is in use.
Quoted 13 lines
drivers/staging/iio/frequency/ad9834.c +1
-1#include <asm/div64.h> #include <linux/iio/iio.h> @@ -152,7 +153,7 @@ static ssize_t ad9834_write(struct device *dev,if (ret)return ret; -mutex_lock (&st->lock); +guard (mutex)(&st->lock);switch ((u32 )this_attr->address) {case AD9834_REG_FREQ0 :case AD9834_REG_FREQ1 :
drivers/staging/iio/frequency/ad9834.c static ssize_t ad9834_write(struct device *dev, · line 212
Quoted 2 lines
drivers/staging/iio/frequency/ad9834.c +0
-0@@ -210,7 +211,6 @@ static ssize_t ad9834_write(struct device *dev,default : ret = -ENODEV ;
The big advantage of using guard() is not removing mutex_unlock() but instead that you can use simpler code flow. Here you should return early.
There are a lot of error returns in this function and it may even make sense to return len early if no error.
Quoted 15 lines
drivers/staging/iio/frequency/ad9834.c +1
-2} -mutex_unlock (&st->lock);return ret ? ret : len; }@@ -226,7 +226,7 @@ static ssize_t ad9834_store_wavetype(struct device *dev,int ret =0 ;bool is_ad9833_7 = (st->devid ==ID_AD9833 ) || (st->devid ==ID_AD9837 ); -mutex_lock (&st->lock); +guard (mutex)(&st->lock);switch ((u32 )this_attr->address) {case 0 :
drivers/staging/iio/frequency/ad9834.c static ssize_t ad9834_store_wavetype(struct device *dev, · line 272
Quoted 4 lines
drivers/staging/iio/frequency/ad9834.c +0
-1@@ -269,7 +269,6 @@ static ssize_t ad9834_store_wavetype(struct device *dev, st->data =cpu_to_be16 (AD9834_REG_CMD | st->control); ret =spi_sync (st->spi, &st->msg); } -mutex_unlock (&st->lock);
Similar applies in this function where there are a lot of paths that can become early error returns if guard() is used.
Jonathan
Quoted 3 lines
drivers/staging/iio/frequency/ad9834.c +0
-0return ret ? ret : len; }