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

cpuidle: Simplify cpuidle_register_device() with guard() 

Use guard() macro for mutex to simplify the control flow in
cpuidle_register_device().

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Link: https://patch.msgid.link/20260403084542.708104-1-lihuisong@huawei.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
master
Huisong Li 2026-04-03 16:45:42 +08:00 committed by Rafael J. Wysocki
parent 9d3a068cc8
commit 629be87e0d
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/cpuidle/cpuidle.c
View File

@ -679,16 +679,16 @@ int cpuidle_register_device(struct cpuidle_device *dev)
if (!dev) if (!dev)
return -EINVAL; return -EINVAL;
mutex_lock(&cpuidle_lock); guard(mutex)(&cpuidle_lock);
if (dev->registered) if (dev->registered)
goto out_unlock; return ret;
__cpuidle_device_init(dev); __cpuidle_device_init(dev);
ret = __cpuidle_register_device(dev); ret = __cpuidle_register_device(dev);
if (ret) if (ret)
goto out_unlock; return ret;
ret = cpuidle_add_sysfs(dev); ret = cpuidle_add_sysfs(dev);
if (ret) if (ret)
@ -700,16 +700,14 @@ int cpuidle_register_device(struct cpuidle_device *dev)
cpuidle_install_idle_handler(); cpuidle_install_idle_handler();
out_unlock:
mutex_unlock(&cpuidle_lock);
return ret; return ret;
out_sysfs: out_sysfs:
cpuidle_remove_sysfs(dev); cpuidle_remove_sysfs(dev);
out_unregister: out_unregister:
__cpuidle_unregister_device(dev); __cpuidle_unregister_device(dev);
goto out_unlock;
return ret;
} }
EXPORT_SYMBOL_GPL(cpuidle_register_device); EXPORT_SYMBOL_GPL(cpuidle_register_device);