Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: aw2: Use guard() for spin locks 

Clean up the code using guard() for spin locks.

Merely code refactoring, and no behavior change.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250829144342.4290-14-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-08-29 16:42:48 +02:00
parent ca10ce1caf
commit 290adc48a2
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/pci/aw2/aw2-alsa.c
View File

@ -397,10 +397,10 @@ static int snd_aw2_pcm_prepare_capture(struct snd_pcm_substream *substream)
static int snd_aw2_pcm_trigger_playback(struct snd_pcm_substream *substream, static int snd_aw2_pcm_trigger_playback(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
int status = 0;
struct aw2_pcm_device *pcm_device = snd_pcm_substream_chip(substream); struct aw2_pcm_device *pcm_device = snd_pcm_substream_chip(substream);
struct aw2 *chip = pcm_device->chip; struct aw2 *chip = pcm_device->chip;
spin_lock(&chip->reg_lock);
guard(spinlock)(&chip->reg_lock);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
snd_aw2_saa7146_pcm_trigger_start_playback(&chip->saa7146, snd_aw2_saa7146_pcm_trigger_start_playback(&chip->saa7146,
@ -413,20 +413,19 @@ static int snd_aw2_pcm_trigger_playback(struct snd_pcm_substream *substream,
stream_number); stream_number);
break; break;
default: default:
status = -EINVAL; return -EINVAL;
} }
spin_unlock(&chip->reg_lock); return 0;
return status;
} }
/* capture trigger callback */ /* capture trigger callback */
static int snd_aw2_pcm_trigger_capture(struct snd_pcm_substream *substream, static int snd_aw2_pcm_trigger_capture(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
int status = 0;
struct aw2_pcm_device *pcm_device = snd_pcm_substream_chip(substream); struct aw2_pcm_device *pcm_device = snd_pcm_substream_chip(substream);
struct aw2 *chip = pcm_device->chip; struct aw2 *chip = pcm_device->chip;
spin_lock(&chip->reg_lock);
guard(spinlock)(&chip->reg_lock);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
snd_aw2_saa7146_pcm_trigger_start_capture(&chip->saa7146, snd_aw2_saa7146_pcm_trigger_start_capture(&chip->saa7146,
@ -439,10 +438,9 @@ static int snd_aw2_pcm_trigger_capture(struct snd_pcm_substream *substream,
stream_number); stream_number);
break; break;
default: default:
status = -EINVAL; return -EINVAL;
} }
spin_unlock(&chip->reg_lock); return 0;
return status;
} }
/* playback pointer callback */ /* playback pointer callback */