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

ALSA: serial-u16550: 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/20250829150026.6379-14-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-08-29 17:00:24 +02:00
parent ec339e149e
commit b9526bff42
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/drivers/serial-u16550.c
View File

@ -281,29 +281,24 @@ static irqreturn_t snd_uart16550_interrupt(int irq, void *dev_id)
struct snd_uart16550 *uart; struct snd_uart16550 *uart;
uart = dev_id; uart = dev_id;
spin_lock(&uart->open_lock); guard(spinlock)(&uart->open_lock);
if (uart->filemode == SERIAL_MODE_NOT_OPENED) { if (uart->filemode == SERIAL_MODE_NOT_OPENED)
spin_unlock(&uart->open_lock);
return IRQ_NONE; return IRQ_NONE;
}
/* indicate to the UART that the interrupt has been serviced */ /* indicate to the UART that the interrupt has been serviced */
inb(uart->base + UART_IIR); inb(uart->base + UART_IIR);
snd_uart16550_io_loop(uart); snd_uart16550_io_loop(uart);
spin_unlock(&uart->open_lock);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
/* When the polling mode, this function calls snd_uart16550_io_loop. */ /* When the polling mode, this function calls snd_uart16550_io_loop. */
static void snd_uart16550_buffer_timer(struct timer_list *t) static void snd_uart16550_buffer_timer(struct timer_list *t)
{ {
unsigned long flags;
struct snd_uart16550 *uart; struct snd_uart16550 *uart;
uart = timer_container_of(uart, t, buffer_timer); uart = timer_container_of(uart, t, buffer_timer);
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
snd_uart16550_del_timer(uart); snd_uart16550_del_timer(uart);
snd_uart16550_io_loop(uart); snd_uart16550_io_loop(uart);
spin_unlock_irqrestore(&uart->open_lock, flags);
} }
/* /*
@ -499,71 +494,61 @@ static void snd_uart16550_do_close(struct snd_uart16550 * uart)
static int snd_uart16550_input_open(struct snd_rawmidi_substream *substream) static int snd_uart16550_input_open(struct snd_rawmidi_substream *substream)
{ {
unsigned long flags;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
if (uart->filemode == SERIAL_MODE_NOT_OPENED) if (uart->filemode == SERIAL_MODE_NOT_OPENED)
snd_uart16550_do_open(uart); snd_uart16550_do_open(uart);
uart->filemode |= SERIAL_MODE_INPUT_OPEN; uart->filemode |= SERIAL_MODE_INPUT_OPEN;
uart->midi_input[substream->number] = substream; uart->midi_input[substream->number] = substream;
spin_unlock_irqrestore(&uart->open_lock, flags);
return 0; return 0;
} }
static int snd_uart16550_input_close(struct snd_rawmidi_substream *substream) static int snd_uart16550_input_close(struct snd_rawmidi_substream *substream)
{ {
unsigned long flags;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
uart->filemode &= ~SERIAL_MODE_INPUT_OPEN; uart->filemode &= ~SERIAL_MODE_INPUT_OPEN;
uart->midi_input[substream->number] = NULL; uart->midi_input[substream->number] = NULL;
if (uart->filemode == SERIAL_MODE_NOT_OPENED) if (uart->filemode == SERIAL_MODE_NOT_OPENED)
snd_uart16550_do_close(uart); snd_uart16550_do_close(uart);
spin_unlock_irqrestore(&uart->open_lock, flags);
return 0; return 0;
} }
static void snd_uart16550_input_trigger(struct snd_rawmidi_substream *substream, static void snd_uart16550_input_trigger(struct snd_rawmidi_substream *substream,
int up) int up)
{ {
unsigned long flags;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
if (up) if (up)
uart->filemode |= SERIAL_MODE_INPUT_TRIGGERED; uart->filemode |= SERIAL_MODE_INPUT_TRIGGERED;
else else
uart->filemode &= ~SERIAL_MODE_INPUT_TRIGGERED; uart->filemode &= ~SERIAL_MODE_INPUT_TRIGGERED;
spin_unlock_irqrestore(&uart->open_lock, flags);
} }
static int snd_uart16550_output_open(struct snd_rawmidi_substream *substream) static int snd_uart16550_output_open(struct snd_rawmidi_substream *substream)
{ {
unsigned long flags;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
if (uart->filemode == SERIAL_MODE_NOT_OPENED) if (uart->filemode == SERIAL_MODE_NOT_OPENED)
snd_uart16550_do_open(uart); snd_uart16550_do_open(uart);
uart->filemode |= SERIAL_MODE_OUTPUT_OPEN; uart->filemode |= SERIAL_MODE_OUTPUT_OPEN;
uart->midi_output[substream->number] = substream; uart->midi_output[substream->number] = substream;
spin_unlock_irqrestore(&uart->open_lock, flags);
return 0; return 0;
}; };
static int snd_uart16550_output_close(struct snd_rawmidi_substream *substream) static int snd_uart16550_output_close(struct snd_rawmidi_substream *substream)
{ {
unsigned long flags;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
uart->filemode &= ~SERIAL_MODE_OUTPUT_OPEN; uart->filemode &= ~SERIAL_MODE_OUTPUT_OPEN;
uart->midi_output[substream->number] = NULL; uart->midi_output[substream->number] = NULL;
if (uart->filemode == SERIAL_MODE_NOT_OPENED) if (uart->filemode == SERIAL_MODE_NOT_OPENED)
snd_uart16550_do_close(uart); snd_uart16550_do_close(uart);
spin_unlock_irqrestore(&uart->open_lock, flags);
return 0; return 0;
}; };
@ -632,7 +617,6 @@ static int snd_uart16550_output_byte(struct snd_uart16550 *uart,
static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream) static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)
{ {
unsigned long flags;
unsigned char midi_byte, addr_byte; unsigned char midi_byte, addr_byte;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
char first; char first;
@ -643,7 +627,7 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)
* variables (ie buff_in & buff_out) * variables (ie buff_in & buff_out)
*/ */
spin_lock_irqsave(&uart->open_lock, flags); guard(spinlock_irqsave)(&uart->open_lock);
if (uart->irq < 0) /* polling */ if (uart->irq < 0) /* polling */
snd_uart16550_io_loop(uart); snd_uart16550_io_loop(uart);
@ -718,21 +702,19 @@ static void snd_uart16550_output_write(struct snd_rawmidi_substream *substream)
} }
lasttime = jiffies; lasttime = jiffies;
} }
spin_unlock_irqrestore(&uart->open_lock, flags);
} }
static void snd_uart16550_output_trigger(struct snd_rawmidi_substream *substream, static void snd_uart16550_output_trigger(struct snd_rawmidi_substream *substream,
int up) int up)
{ {
unsigned long flags;
struct snd_uart16550 *uart = substream->rmidi->private_data; struct snd_uart16550 *uart = substream->rmidi->private_data;
spin_lock_irqsave(&uart->open_lock, flags); scoped_guard(spinlock_irqsave, &uart->open_lock) {
if (up) if (up)
uart->filemode |= SERIAL_MODE_OUTPUT_TRIGGERED; uart->filemode |= SERIAL_MODE_OUTPUT_TRIGGERED;
else else
uart->filemode &= ~SERIAL_MODE_OUTPUT_TRIGGERED; uart->filemode &= ~SERIAL_MODE_OUTPUT_TRIGGERED;
spin_unlock_irqrestore(&uart->open_lock, flags); }
if (up) if (up)
snd_uart16550_output_write(substream); snd_uart16550_output_write(substream);
} }