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

ALSA: pxa2xx: Use guard() for mutex locks 

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-16-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2025-08-29 17:13:29 +02:00
parent bc58470aa2
commit 372020ddaa
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/arm/pxa2xx-ac97-lib.c
View File

@ -51,7 +51,7 @@ int pxa2xx_ac97_read(int slot, unsigned short reg)
if (slot > 0) if (slot > 0)
return -ENODEV; return -ENODEV;
mutex_lock(&car_mutex); guard(mutex)(&car_mutex);
/* set up primary or secondary codec space */ /* set up primary or secondary codec space */
if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS) if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)
@ -67,13 +67,12 @@ int pxa2xx_ac97_read(int slot, unsigned short reg)
gsr_bits = 0; gsr_bits = 0;
val = (readl(reg_addr) & 0xffff); val = (readl(reg_addr) & 0xffff);
if (reg == AC97_GPIO_STATUS) if (reg == AC97_GPIO_STATUS)
goto out; return val;
if (wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) & GSR_SDONE, 1) <= 0 && if (wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) & GSR_SDONE, 1) <= 0 &&
!((readl(ac97_reg_base + GSR) | gsr_bits) & GSR_SDONE)) { !((readl(ac97_reg_base + GSR) | gsr_bits) & GSR_SDONE)) {
printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n", printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n",
__func__, reg, readl(ac97_reg_base + GSR) | gsr_bits); __func__, reg, readl(ac97_reg_base + GSR) | gsr_bits);
val = -ETIMEDOUT; return -ETIMEDOUT;
goto out;
} }
/* valid data now */ /* valid data now */
@ -82,8 +81,6 @@ int pxa2xx_ac97_read(int slot, unsigned short reg)
val = (readl(reg_addr) & 0xffff); val = (readl(reg_addr) & 0xffff);
/* but we've just started another cycle... */ /* but we've just started another cycle... */
wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) & GSR_SDONE, 1); wait_event_timeout(gsr_wq, (readl(ac97_reg_base + GSR) | gsr_bits) & GSR_SDONE, 1);
out: mutex_unlock(&car_mutex);
return val; return val;
} }
EXPORT_SYMBOL_GPL(pxa2xx_ac97_read); EXPORT_SYMBOL_GPL(pxa2xx_ac97_read);
@ -93,7 +90,7 @@ int pxa2xx_ac97_write(int slot, unsigned short reg, unsigned short val)
u32 __iomem *reg_addr; u32 __iomem *reg_addr;
int ret = 0; int ret = 0;
mutex_lock(&car_mutex); guard(mutex)(&car_mutex);
/* set up primary or secondary codec space */ /* set up primary or secondary codec space */
if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS) if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)
@ -114,7 +111,6 @@ int pxa2xx_ac97_write(int slot, unsigned short reg, unsigned short val)
ret = -EIO; ret = -EIO;
} }
mutex_unlock(&car_mutex);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(pxa2xx_ac97_write); EXPORT_SYMBOL_GPL(pxa2xx_ac97_write);