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

ALSA: opti9xx: 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/20250829145300.5460-12-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-08-29 16:52:51 +02:00
parent 1e012ff2fb
commit 949ffce4af
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/isa/opti9xx/miro.c
View File

@ -822,10 +822,9 @@ static int snd_miro_init(struct snd_miro *chip,
static unsigned char snd_miro_read(struct snd_miro *chip, static unsigned char snd_miro_read(struct snd_miro *chip,
unsigned char reg) unsigned char reg)
{ {
unsigned long flags;
unsigned char retval = 0xff; unsigned char retval = 0xff;
spin_lock_irqsave(&chip->lock, flags); guard(spinlock_irqsave)(&chip->lock);
outb(chip->password, chip->mc_base + chip->pwd_reg); outb(chip->password, chip->mc_base + chip->pwd_reg);
switch (chip->hardware) { switch (chip->hardware) {
@ -846,16 +845,13 @@ static unsigned char snd_miro_read(struct snd_miro *chip,
dev_err(chip->card->dev, "sorry, no support for %d\n", chip->hardware); dev_err(chip->card->dev, "sorry, no support for %d\n", chip->hardware);
} }
spin_unlock_irqrestore(&chip->lock, flags);
return retval; return retval;
} }
static void snd_miro_write(struct snd_miro *chip, unsigned char reg, static void snd_miro_write(struct snd_miro *chip, unsigned char reg,
unsigned char value) unsigned char value)
{ {
unsigned long flags; guard(spinlock_irqsave)(&chip->lock);
spin_lock_irqsave(&chip->lock, flags);
outb(chip->password, chip->mc_base + chip->pwd_reg); outb(chip->password, chip->mc_base + chip->pwd_reg);
switch (chip->hardware) { switch (chip->hardware) {
@ -875,8 +871,6 @@ static void snd_miro_write(struct snd_miro *chip, unsigned char reg,
default: default:
dev_err(chip->card->dev, "sorry, no support for %d\n", chip->hardware); dev_err(chip->card->dev, "sorry, no support for %d\n", chip->hardware);
} }
spin_unlock_irqrestore(&chip->lock, flags);
} }
static inline void snd_miro_write_mask(struct snd_miro *chip, static inline void snd_miro_write_mask(struct snd_miro *chip,
@ -1013,7 +1007,6 @@ static int snd_miro_configure(struct snd_miro *chip)
unsigned char dma_bits; unsigned char dma_bits;
unsigned char mpu_port_bits = 0; unsigned char mpu_port_bits = 0;
unsigned char mpu_irq_bits; unsigned char mpu_irq_bits;
unsigned long flags;
snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80); snd_miro_write_mask(chip, OPTi9XX_MC_REG(1), 0x80, 0x80);
snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */ snd_miro_write_mask(chip, OPTi9XX_MC_REG(2), 0x20, 0x20); /* OPL4 */
@ -1109,9 +1102,9 @@ static int snd_miro_configure(struct snd_miro *chip)
} }
dma_bits |= 0x04; dma_bits |= 0x04;
spin_lock_irqsave(&chip->lock, flags); scoped_guard(spinlock_irqsave, &chip->lock) {
outb(irq_bits << 3 | dma_bits, chip->wss_base); outb(irq_bits << 3 | dma_bits, chip->wss_base);
spin_unlock_irqrestore(&chip->lock, flags); }
__skip_resources: __skip_resources:
if (chip->hardware > OPTi9XX_HW_82C928) { if (chip->hardware > OPTi9XX_HW_82C928) {

21
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -228,10 +228,9 @@ static int snd_opti9xx_init(struct snd_opti9xx *chip,
static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip, static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,
unsigned char reg) unsigned char reg)
{ {
unsigned long flags;
unsigned char retval = 0xff; unsigned char retval = 0xff;
spin_lock_irqsave(&chip->lock, flags); guard(spinlock_irqsave)(&chip->lock);
outb(chip->password, chip->mc_base + chip->pwd_reg); outb(chip->password, chip->mc_base + chip->pwd_reg);
switch (chip->hardware) { switch (chip->hardware) {
@ -265,16 +264,13 @@ static unsigned char snd_opti9xx_read(struct snd_opti9xx *chip,
dev_err(chip->card->dev, "chip %d not supported\n", chip->hardware); dev_err(chip->card->dev, "chip %d not supported\n", chip->hardware);
} }
spin_unlock_irqrestore(&chip->lock, flags);
return retval; return retval;
} }
static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg, static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
unsigned char value) unsigned char value)
{ {
unsigned long flags; guard(spinlock_irqsave)(&chip->lock);
spin_lock_irqsave(&chip->lock, flags);
outb(chip->password, chip->mc_base + chip->pwd_reg); outb(chip->password, chip->mc_base + chip->pwd_reg);
switch (chip->hardware) { switch (chip->hardware) {
@ -307,8 +303,6 @@ static void snd_opti9xx_write(struct snd_opti9xx *chip, unsigned char reg,
default: default:
dev_err(chip->card->dev, "chip %d not supported\n", chip->hardware); dev_err(chip->card->dev, "chip %d not supported\n", chip->hardware);
} }
spin_unlock_irqrestore(&chip->lock, flags);
} }
@ -659,9 +653,6 @@ static int snd_opti9xx_read_check(struct snd_card *card,
struct snd_opti9xx *chip) struct snd_opti9xx *chip)
{ {
unsigned char value; unsigned char value;
#ifdef OPTi93X
unsigned long flags;
#endif
chip->res_mc_base = chip->res_mc_base =
devm_request_region(card->dev, chip->mc_base, devm_request_region(card->dev, chip->mc_base,
@ -680,10 +671,10 @@ static int snd_opti9xx_read_check(struct snd_card *card,
if (!chip->res_mc_indir) if (!chip->res_mc_indir)
return -EBUSY; return -EBUSY;
spin_lock_irqsave(&chip->lock, flags); scoped_guard(spinlock_irqsave, &chip->lock) {
outb(chip->password, chip->mc_base + chip->pwd_reg); outb(chip->password, chip->mc_base + chip->pwd_reg);
outb(((chip->mc_indir_index & 0x1f0) >> 4), chip->mc_base); outb(((chip->mc_indir_index & 0x1f0) >> 4), chip->mc_base);
spin_unlock_irqrestore(&chip->lock, flags); }
value = snd_opti9xx_read(chip, OPTi9XX_MC_REG(7)); value = snd_opti9xx_read(chip, OPTi9XX_MC_REG(7));
snd_opti9xx_write(chip, OPTi9XX_MC_REG(7), 0xff - value); snd_opti9xx_write(chip, OPTi9XX_MC_REG(7), 0xff - value);