ASoC: codecs: wsa88xx: Use guard() for mutex locks

Clean up the code using guard() for mutex locks.
Merely code refactoring, and no behavior change.

Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20260731030648.8706-27-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
bui duc phuc 2026-07-31 10:06:48 +07:00 committed by Mark Brown
parent 46f3500915
commit 3ca9593964
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 9 additions and 12 deletions

View File

@ -4,6 +4,7 @@
*/
#include <linux/bitops.h>
#include <linux/cleanup.h>
#include <linux/device.h>
#include <linux/gpio/consumer.h>
#include <linux/hwmon.h>
@ -1237,9 +1238,8 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_widget *w,
switch (event) {
case SND_SOC_DAPM_POST_PMU:
mutex_lock(&wsa883x->sp_lock);
wsa883x->pa_on = true;
mutex_unlock(&wsa883x->sp_lock);
scoped_guard(mutex, &wsa883x->sp_lock)
wsa883x->pa_on = true;
switch (wsa883x->dev_mode) {
case RECEIVER:
@ -1290,9 +1290,8 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_widget *w,
WSA883X_GLOBAL_PA_EN_MASK, 0);
snd_soc_component_write_field(component, WSA883X_PDM_WD_CTL,
WSA883X_PDM_EN_MASK, 0);
mutex_lock(&wsa883x->sp_lock);
wsa883x->pa_on = false;
mutex_unlock(&wsa883x->sp_lock);
scoped_guard(mutex, &wsa883x->sp_lock)
wsa883x->pa_on = false;
break;
}
return 0;

View File

@ -1701,9 +1701,8 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_widget *w,
switch (event) {
case SND_SOC_DAPM_POST_PMU:
mutex_lock(&wsa884x->sp_lock);
wsa884x->pa_on = true;
mutex_unlock(&wsa884x->sp_lock);
scoped_guard(mutex, &wsa884x->sp_lock)
wsa884x->pa_on = true;
wsa884x_spkr_post_pmu(component, wsa884x);
@ -1717,9 +1716,8 @@ static int wsa884x_spkr_event(struct snd_soc_dapm_widget *w,
WSA884X_PDM_WD_CTL_PDM_WD_EN_MASK,
0x0);
mutex_lock(&wsa884x->sp_lock);
wsa884x->pa_on = false;
mutex_unlock(&wsa884x->sp_lock);
scoped_guard(mutex, &wsa884x->sp_lock)
wsa884x->pa_on = false;
break;
}