ALSA: i2c: Use guard() for mutex locks

Replace the manual mutex lock/unlock pairs with guard() for code
simplification.

Only code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250829151335.7342-2-tiwai@suse.de

diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index c1f7447a4d11dee5f88b7ff4079713f95f0848bf..fd54e44fe7d650f63be7ca4a78d9cfb558895cc0 100644 (file)
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -127,9 +127,9 @@ void snd_ak4113_reinit(struct ak4113 *chip)
 {
        if (atomic_inc_return(&chip->wq_processing) == 1)
                cancel_delayed_work_sync(&chip->work);
-       mutex_lock(&chip->reinit_mutex);
-       ak4113_init_regs(chip);
-       mutex_unlock(&chip->reinit_mutex);
+       scoped_guard(mutex, &chip->reinit_mutex) {
+               ak4113_init_regs(chip);
+       }
        /* bring up statistics / event queing */
        if (atomic_dec_and_test(&chip->wq_processing))
                schedule_delayed_work(&chip->work, HZ / 10);

diff --git a/sound/i2c/other/ak4114.c b/sound/i2c/other/ak4114.c
index 7c493681f3cb6ec94ce0c8281ad052e84702fe38..f4ded69bb0e428d4be49135e22b9986df3d16af0 100644 (file)
--- a/sound/i2c/other/ak4114.c
+++ b/sound/i2c/other/ak4114.c
@@ -132,9 +132,9 @@ void snd_ak4114_reinit(struct ak4114 *chip)
 {
        if (atomic_inc_return(&chip->wq_processing) == 1)
                cancel_delayed_work_sync(&chip->work);
-       mutex_lock(&chip->reinit_mutex);
-       ak4114_init_regs(chip);
-       mutex_unlock(&chip->reinit_mutex);
+       scoped_guard(mutex, &chip->reinit_mutex) {
+               ak4114_init_regs(chip);
+       }
        /* bring up statistics / event queing */
        if (atomic_dec_and_test(&chip->wq_processing))
                schedule_delayed_work(&chip->work, HZ / 10);