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

ALSA: cs4281: 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-19-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-08-29 16:42:53 +02:00
parent 40bc78567f
commit 7a5127c2c8
1 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sound/pci/cs4281.c
View File

@ -651,7 +651,7 @@ static int snd_cs4281_trigger(struct snd_pcm_substream *substream, int cmd)
struct cs4281_dma *dma = substream->runtime->private_data; struct cs4281_dma *dma = substream->runtime->private_data;
struct cs4281 *chip = snd_pcm_substream_chip(substream); struct cs4281 *chip = snd_pcm_substream_chip(substream);
spin_lock(&chip->reg_lock); guard(spinlock)(&chip->reg_lock);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_PAUSE_PUSH: case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
dma->valDCR |= BA0_DCR_MSK; dma->valDCR |= BA0_DCR_MSK;
@ -678,13 +678,11 @@ static int snd_cs4281_trigger(struct snd_pcm_substream *substream, int cmd)
dma->valFCR &= ~BA0_FCR_FEN; dma->valFCR &= ~BA0_FCR_FEN;
break; break;
default: default:
spin_unlock(&chip->reg_lock);
return -EINVAL; return -EINVAL;
} }
snd_cs4281_pokeBA0(chip, dma->regDMR, dma->valDMR); snd_cs4281_pokeBA0(chip, dma->regDMR, dma->valDMR);
snd_cs4281_pokeBA0(chip, dma->regFCR, dma->valFCR); snd_cs4281_pokeBA0(chip, dma->regFCR, dma->valFCR);
snd_cs4281_pokeBA0(chip, dma->regDCR, dma->valDCR); snd_cs4281_pokeBA0(chip, dma->regDCR, dma->valDCR);
spin_unlock(&chip->reg_lock);
return 0; return 0;
} }
@ -782,9 +780,8 @@ static int snd_cs4281_playback_prepare(struct snd_pcm_substream *substream)
struct cs4281_dma *dma = runtime->private_data; struct cs4281_dma *dma = runtime->private_data;
struct cs4281 *chip = snd_pcm_substream_chip(substream); struct cs4281 *chip = snd_pcm_substream_chip(substream);
spin_lock_irq(&chip->reg_lock); guard(spinlock_irq)(&chip->reg_lock);
snd_cs4281_mode(chip, dma, runtime, 0, 1); snd_cs4281_mode(chip, dma, runtime, 0, 1);
spin_unlock_irq(&chip->reg_lock);
return 0; return 0;
} }
@ -794,9 +791,8 @@ static int snd_cs4281_capture_prepare(struct snd_pcm_substream *substream)
struct cs4281_dma *dma = runtime->private_data; struct cs4281_dma *dma = runtime->private_data;
struct cs4281 *chip = snd_pcm_substream_chip(substream); struct cs4281 *chip = snd_pcm_substream_chip(substream);
spin_lock_irq(&chip->reg_lock); guard(spinlock_irq)(&chip->reg_lock);
snd_cs4281_mode(chip, dma, runtime, 1, 1); snd_cs4281_mode(chip, dma, runtime, 1, 1);
spin_unlock_irq(&chip->reg_lock);
return 0; return 0;
} }
@ -1580,7 +1576,7 @@ static int snd_cs4281_midi_input_open(struct snd_rawmidi_substream *substream)
{ {
struct cs4281 *chip = substream->rmidi->private_data; struct cs4281 *chip = substream->rmidi->private_data;
spin_lock_irq(&chip->reg_lock); guard(spinlock_irq)(&chip->reg_lock);
chip->midcr |= BA0_MIDCR_RXE; chip->midcr |= BA0_MIDCR_RXE;
chip->midi_input = substream; chip->midi_input = substream;
if (!(chip->uartm & CS4281_MODE_OUTPUT)) { if (!(chip->uartm & CS4281_MODE_OUTPUT)) {
@ -1588,7 +1584,6 @@ static int snd_cs4281_midi_input_open(struct snd_rawmidi_substream *substream)
} else { } else {
snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr); snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr);
} }
spin_unlock_irq(&chip->reg_lock);
return 0; return 0;
} }
@ -1596,7 +1591,7 @@ static int snd_cs4281_midi_input_close(struct snd_rawmidi_substream *substream)
{ {
struct cs4281 *chip = substream->rmidi->private_data; struct cs4281 *chip = substream->rmidi->private_data;
spin_lock_irq(&chip->reg_lock); guard(spinlock_irq)(&chip->reg_lock);
chip->midcr &= ~(BA0_MIDCR_RXE | BA0_MIDCR_RIE); chip->midcr &= ~(BA0_MIDCR_RXE | BA0_MIDCR_RIE);
chip->midi_input = NULL; chip->midi_input = NULL;
if (!(chip->uartm & CS4281_MODE_OUTPUT)) { if (!(chip->uartm & CS4281_MODE_OUTPUT)) {
@ -1605,7 +1600,6 @@ static int snd_cs4281_midi_input_close(struct snd_rawmidi_substream *substream)
snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr); snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr);
} }
chip->uartm &= ~CS4281_MODE_INPUT; chip->uartm &= ~CS4281_MODE_INPUT;
spin_unlock_irq(&chip->reg_lock);
return 0; return 0;
} }
@ -1613,7 +1607,7 @@ static int snd_cs4281_midi_output_open(struct snd_rawmidi_substream *substream)
{ {
struct cs4281 *chip = substream->rmidi->private_data; struct cs4281 *chip = substream->rmidi->private_data;
spin_lock_irq(&chip->reg_lock); guard(spinlock_irq)(&chip->reg_lock);
chip->uartm |= CS4281_MODE_OUTPUT; chip->uartm |= CS4281_MODE_OUTPUT;
chip->midcr |= BA0_MIDCR_TXE; chip->midcr |= BA0_MIDCR_TXE;
chip->midi_output = substream; chip->midi_output = substream;
@ -1622,7 +1616,6 @@ static int snd_cs4281_midi_output_open(struct snd_rawmidi_substream *substream)
} else { } else {
snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr); snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr);
} }
spin_unlock_irq(&chip->reg_lock);
return 0; return 0;
} }
@ -1630,7 +1623,7 @@ static int snd_cs4281_midi_output_close(struct snd_rawmidi_substream *substream)
{ {
struct cs4281 *chip = substream->rmidi->private_data; struct cs4281 *chip = substream->rmidi->private_data;
spin_lock_irq(&chip->reg_lock); guard(spinlock_irq)(&chip->reg_lock);
chip->midcr &= ~(BA0_MIDCR_TXE | BA0_MIDCR_TIE); chip->midcr &= ~(BA0_MIDCR_TXE | BA0_MIDCR_TIE);
chip->midi_output = NULL; chip->midi_output = NULL;
if (!(chip->uartm & CS4281_MODE_INPUT)) { if (!(chip->uartm & CS4281_MODE_INPUT)) {
@ -1639,16 +1632,14 @@ static int snd_cs4281_midi_output_close(struct snd_rawmidi_substream *substream)
snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr); snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr);
} }
chip->uartm &= ~CS4281_MODE_OUTPUT; chip->uartm &= ~CS4281_MODE_OUTPUT;
spin_unlock_irq(&chip->reg_lock);
return 0; return 0;
} }
static void snd_cs4281_midi_input_trigger(struct snd_rawmidi_substream *substream, int up) static void snd_cs4281_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
unsigned long flags;
struct cs4281 *chip = substream->rmidi->private_data; struct cs4281 *chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->reg_lock, flags); guard(spinlock_irqsave)(&chip->reg_lock);
if (up) { if (up) {
if ((chip->midcr & BA0_MIDCR_RIE) == 0) { if ((chip->midcr & BA0_MIDCR_RIE) == 0) {
chip->midcr |= BA0_MIDCR_RIE; chip->midcr |= BA0_MIDCR_RIE;
@ -1660,16 +1651,14 @@ static void snd_cs4281_midi_input_trigger(struct snd_rawmidi_substream *substrea
snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr); snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr);
} }
} }
spin_unlock_irqrestore(&chip->reg_lock, flags);
} }
static void snd_cs4281_midi_output_trigger(struct snd_rawmidi_substream *substream, int up) static void snd_cs4281_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
unsigned long flags;
struct cs4281 *chip = substream->rmidi->private_data; struct cs4281 *chip = substream->rmidi->private_data;
unsigned char byte; unsigned char byte;
spin_lock_irqsave(&chip->reg_lock, flags); guard(spinlock_irqsave)(&chip->reg_lock);
if (up) { if (up) {
if ((chip->midcr & BA0_MIDCR_TIE) == 0) { if ((chip->midcr & BA0_MIDCR_TIE) == 0) {
chip->midcr |= BA0_MIDCR_TIE; chip->midcr |= BA0_MIDCR_TIE;
@ -1690,7 +1679,6 @@ static void snd_cs4281_midi_output_trigger(struct snd_rawmidi_substream *substre
snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr); snd_cs4281_pokeBA0(chip, BA0_MIDCR, chip->midcr);
} }
} }
spin_unlock_irqrestore(&chip->reg_lock, flags);
} }
static const struct snd_rawmidi_ops snd_cs4281_midi_output = static const struct snd_rawmidi_ops snd_cs4281_midi_output =
@ -1743,10 +1731,12 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)
} }
if (status & (BA0_HISR_DMA(0)|BA0_HISR_DMA(1)|BA0_HISR_DMA(2)|BA0_HISR_DMA(3))) { if (status & (BA0_HISR_DMA(0)|BA0_HISR_DMA(1)|BA0_HISR_DMA(2)|BA0_HISR_DMA(3))) {
for (dma = 0; dma < 4; dma++) for (dma = 0; dma < 4; dma++) {
if (status & BA0_HISR_DMA(dma)) { bool period_elapsed = false;
cdma = &chip->dma[dma]; cdma = &chip->dma[dma];
spin_lock(&chip->reg_lock);
if (status & BA0_HISR_DMA(dma)) {
guard(spinlock)(&chip->reg_lock);
/* ack DMA IRQ */ /* ack DMA IRQ */
val = snd_cs4281_peekBA0(chip, cdma->regHDSR); val = snd_cs4281_peekBA0(chip, cdma->regHDSR);
/* workaround, sometimes CS4281 acknowledges */ /* workaround, sometimes CS4281 acknowledges */
@ -1755,16 +1745,15 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)
if ((val & BA0_HDSR_DHTC) && !(cdma->frag & 1)) { if ((val & BA0_HDSR_DHTC) && !(cdma->frag & 1)) {
cdma->frag--; cdma->frag--;
chip->spurious_dhtc_irq++; chip->spurious_dhtc_irq++;
spin_unlock(&chip->reg_lock);
continue; continue;
} }
if ((val & BA0_HDSR_DTC) && (cdma->frag & 1)) { if ((val & BA0_HDSR_DTC) && (cdma->frag & 1)) {
cdma->frag--; cdma->frag--;
chip->spurious_dtc_irq++; chip->spurious_dtc_irq++;
spin_unlock(&chip->reg_lock);
continue; continue;
} }
spin_unlock(&chip->reg_lock); }
if (period_elapsed)
snd_pcm_period_elapsed(cdma->substream); snd_pcm_period_elapsed(cdma->substream);
} }
} }
@ -1772,7 +1761,7 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)
if ((status & BA0_HISR_MIDI) && chip->rmidi) { if ((status & BA0_HISR_MIDI) && chip->rmidi) {
unsigned char c; unsigned char c;
spin_lock(&chip->reg_lock); guard(spinlock)(&chip->reg_lock);
while ((snd_cs4281_peekBA0(chip, BA0_MIDSR) & BA0_MIDSR_RBE) == 0) { while ((snd_cs4281_peekBA0(chip, BA0_MIDSR) & BA0_MIDSR_RBE) == 0) {
c = snd_cs4281_peekBA0(chip, BA0_MIDRP); c = snd_cs4281_peekBA0(chip, BA0_MIDRP);
if ((chip->midcr & BA0_MIDCR_RIE) == 0) if ((chip->midcr & BA0_MIDCR_RIE) == 0)
@ -1789,7 +1778,6 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)
} }
snd_cs4281_pokeBA0(chip, BA0_MIDWP, c); snd_cs4281_pokeBA0(chip, BA0_MIDWP, c);
} }
spin_unlock(&chip->reg_lock);
} }
/* EOI to the PCI part... reenables interrupts */ /* EOI to the PCI part... reenables interrupts */
@ -1805,7 +1793,6 @@ static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id)
static void snd_cs4281_opl3_command(struct snd_opl3 *opl3, unsigned short cmd, static void snd_cs4281_opl3_command(struct snd_opl3 *opl3, unsigned short cmd,
unsigned char val) unsigned char val)
{ {
unsigned long flags;
struct cs4281 *chip = opl3->private_data; struct cs4281 *chip = opl3->private_data;
void __iomem *port; void __iomem *port;
@ -1814,15 +1801,13 @@ static void snd_cs4281_opl3_command(struct snd_opl3 *opl3, unsigned short cmd,
else else
port = chip->ba0 + BA0_B0AP; /* left port */ port = chip->ba0 + BA0_B0AP; /* left port */
spin_lock_irqsave(&opl3->reg_lock, flags); guard(spinlock_irqsave)(&opl3->reg_lock);
writel((unsigned int)cmd, port); writel((unsigned int)cmd, port);
udelay(10); udelay(10);
writel((unsigned int)val, port + 4); writel((unsigned int)val, port + 4);
udelay(30); udelay(30);
spin_unlock_irqrestore(&opl3->reg_lock, flags);
} }
static int __snd_cs4281_probe(struct pci_dev *pci, static int __snd_cs4281_probe(struct pci_dev *pci,