Maksytka/linux
1
1
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-01 07:26:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: ac97bus: Use guard() for mutex locks

Browse Source 
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-18-tiwai@suse.de
This commit is contained in:
Takashi Iwai
2025-08-29 17:13:31 +02:00
parent 94f8cb2b35
commit c07824a14d
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sound/ac97/bus.c
View File

@@ -241,10 +241,9 @@ static ssize_t cold_reset_store(struct device *dev,
{ {
struct ac97_controller *ac97_ctrl; struct ac97_controller *ac97_ctrl;
mutex_lock(&ac97_controllers_mutex); guard(mutex)(&ac97_controllers_mutex);
ac97_ctrl = to_ac97_controller(dev); ac97_ctrl = to_ac97_controller(dev);
ac97_ctrl->ops->reset(ac97_ctrl); ac97_ctrl->ops->reset(ac97_ctrl);
mutex_unlock(&ac97_controllers_mutex);
return len; return len;
} }
static DEVICE_ATTR_WO(cold_reset); static DEVICE_ATTR_WO(cold_reset);
@@ -258,10 +257,9 @@ static ssize_t warm_reset_store(struct device *dev,
if (!dev) if (!dev)
return -ENODEV; return -ENODEV;
mutex_lock(&ac97_controllers_mutex); guard(mutex)(&ac97_controllers_mutex);
ac97_ctrl = to_ac97_controller(dev); ac97_ctrl = to_ac97_controller(dev);
ac97_ctrl->ops->warm_reset(ac97_ctrl); ac97_ctrl->ops->warm_reset(ac97_ctrl);
mutex_unlock(&ac97_controllers_mutex);
return len; return len;
} }
static DEVICE_ATTR_WO(warm_reset); static DEVICE_ATTR_WO(warm_reset);
@@ -284,10 +282,10 @@ static const struct attribute_group *ac97_adapter_groups[] = {
static void ac97_del_adapter(struct ac97_controller *ac97_ctrl) static void ac97_del_adapter(struct ac97_controller *ac97_ctrl)
{ {
mutex_lock(&ac97_controllers_mutex); scoped_guard(mutex, &ac97_controllers_mutex) {
ac97_ctrl_codecs_unregister(ac97_ctrl); ac97_ctrl_codecs_unregister(ac97_ctrl);
list_del(&ac97_ctrl->controllers); list_del(&ac97_ctrl->controllers);
mutex_unlock(&ac97_controllers_mutex); }
device_unregister(&ac97_ctrl->adap); device_unregister(&ac97_ctrl->adap);
} }
@@ -311,7 +309,7 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl)
{ {
int ret; int ret;
mutex_lock(&ac97_controllers_mutex); guard(mutex)(&ac97_controllers_mutex);
ret = idr_alloc(&ac97_adapter_idr, ac97_ctrl, 0, 0, GFP_KERNEL); ret = idr_alloc(&ac97_adapter_idr, ac97_ctrl, 0, 0, GFP_KERNEL);
ac97_ctrl->nr = ret; ac97_ctrl->nr = ret;
if (ret >= 0) { if (ret >= 0) {
@@ -322,13 +320,11 @@ static int ac97_add_adapter(struct ac97_controller *ac97_ctrl)
if (ret) if (ret)
put_device(&ac97_ctrl->adap); put_device(&ac97_ctrl->adap);
} }
if (!ret) if (!ret) {
list_add(&ac97_ctrl->controllers, &ac97_controllers); list_add(&ac97_ctrl->controllers, &ac97_controllers);
mutex_unlock(&ac97_controllers_mutex);
if (!ret)
dev_dbg(&ac97_ctrl->adap, "adapter registered by %s\n", dev_dbg(&ac97_ctrl->adap, "adapter registered by %s\n",
dev_name(ac97_ctrl->parent)); dev_name(ac97_ctrl->parent));
}
return ret; return ret;
} }