Maksytka/linux
1
1
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-11-30 23:16:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: vxpocket: Use guard() for mutex locks

Browse Source 
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-12-tiwai@suse.de
This commit is contained in:
Takashi Iwai
2025-08-29 17:13:25 +02:00
parent 2c24032607
commit 89008621bb
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pcmcia/vx/vxp_mixer.c
View File

@@ -43,14 +43,12 @@ static int vx_mic_level_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
if (val > MIC_LEVEL_MAX) if (val > MIC_LEVEL_MAX)
return -EINVAL; return -EINVAL;
mutex_lock(&_chip->mixer_mutex); guard(mutex)(&_chip->mixer_mutex);
if (chip->mic_level != ucontrol->value.integer.value[0]) { if (chip->mic_level != ucontrol->value.integer.value[0]) {
vx_set_mic_level(_chip, ucontrol->value.integer.value[0]); vx_set_mic_level(_chip, ucontrol->value.integer.value[0]);
chip->mic_level = ucontrol->value.integer.value[0]; chip->mic_level = ucontrol->value.integer.value[0];
mutex_unlock(&_chip->mixer_mutex);
return 1; return 1;
} }
mutex_unlock(&_chip->mixer_mutex);
return 0; return 0;
} }
@@ -85,14 +83,13 @@ static int vx_mic_boost_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_v
struct vx_core *_chip = snd_kcontrol_chip(kcontrol); struct vx_core *_chip = snd_kcontrol_chip(kcontrol);
struct snd_vxpocket *chip = to_vxpocket(_chip); struct snd_vxpocket *chip = to_vxpocket(_chip);
int val = !!ucontrol->value.integer.value[0]; int val = !!ucontrol->value.integer.value[0];
mutex_lock(&_chip->mixer_mutex);
guard(mutex)(&_chip->mixer_mutex);
if (chip->mic_level != val) { if (chip->mic_level != val) {
vx_set_mic_boost(_chip, val); vx_set_mic_boost(_chip, val);
chip->mic_level = val; chip->mic_level = val;
mutex_unlock(&_chip->mixer_mutex);
return 1; return 1;
} }
mutex_unlock(&_chip->mixer_mutex);
return 0; return 0;
} }

6
sound/pcmcia/vx/vxp_ops.c
View File

@@ -463,7 +463,7 @@ void vx_set_mic_boost(struct vx_core *chip, int boost)
if (chip->chip_status & VX_STAT_IS_STALE) if (chip->chip_status & VX_STAT_IS_STALE)
return; return;
mutex_lock(&chip->lock); guard(mutex)(&chip->lock);
if (pchip->regCDSP & P24_CDSP_MICS_SEL_MASK) { if (pchip->regCDSP & P24_CDSP_MICS_SEL_MASK) {
if (boost) { if (boost) {
/* boost: 38 dB */ /* boost: 38 dB */
@@ -476,7 +476,6 @@ void vx_set_mic_boost(struct vx_core *chip, int boost)
} }
vx_outb(chip, CDSP, pchip->regCDSP); vx_outb(chip, CDSP, pchip->regCDSP);
} }
mutex_unlock(&chip->lock);
} }
/* /*
@@ -505,12 +504,11 @@ void vx_set_mic_level(struct vx_core *chip, int level)
if (chip->chip_status & VX_STAT_IS_STALE) if (chip->chip_status & VX_STAT_IS_STALE)
return; return;
mutex_lock(&chip->lock); guard(mutex)(&chip->lock);
if (pchip->regCDSP & VXP_CDSP_MIC_SEL_MASK) { if (pchip->regCDSP & VXP_CDSP_MIC_SEL_MASK) {
level = vx_compute_mic_level(level); level = vx_compute_mic_level(level);
vx_outb(chip, MICRO, level); vx_outb(chip, MICRO, level);
} }
mutex_unlock(&chip->lock);
} }