thermal: intel: powerclamp: Simplify duration_get()
PATCH 1/2 thermal: intel: powerclamp: Simplify duration_get()
Use guard(mutex) and return the result of sysfs_emit() directly to simplify the code. Also use %u to format the unsigned duration.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/thermal/intel/intel_powerclamp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/thermal/intel/intel_powerclamp.c +2 -6
@@ -103,13 +103,9 @@ static int duration_set(const char *arg, const struct kernel_param *kp)static int duration_get (char *buf,const struct kernel_param *kp) { -int ret; +guard (mutex)(&powerclamp_lock); -mutex_lock (&powerclamp_lock); - ret =sysfs_emit (buf,"%d\n" , duration /1000 ); -mutex_unlock (&powerclamp_lock); - -return ret; +return sysfs_emit (buf,"%u\n" , duration /1000 ); }static const struct kernel_param_ops duration_ops = {
PATCH 2/2 thermal: intel: powerclamp: Simplify max_idle_set()
Use guard(mutex) and return errors directly to simplify the code.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/thermal/intel/intel_powerclamp.c | 29 ++++++++---------------- 1 file changed, 10 insertions(+), 19 deletions(-)
drivers/thermal/intel/intel_powerclamp.c +10 -19
@@ -210,41 +210,32 @@ MODULE_PARM_DESC(cpumask, "Mask of CPUs to use for idle injection.");static int max_idle_set (const char *arg,const struct kernel_param *kp) {u8 new_max_idle; -int ret =0 ; +int ret; -mutex_lock (&powerclamp_lock); +guard (mutex)(&powerclamp_lock);/* Can't set mask when cooling device is in use */ -if (powerclamp_data.clamping) { - ret = -EAGAIN ; - goto skip_limit_set; - } +if (powerclamp_data.clamping) +return -EAGAIN ; ret =kstrtou8 (arg,10 , &new_max_idle);if (ret) - goto skip_limit_set; +return ret; -if (new_max_idle >MAX_TARGET_RATIO ) { - ret = -EINVAL ; - goto skip_limit_set; - } +if (new_max_idle >MAX_TARGET_RATIO ) +return -EINVAL ;if (!cpumask_available (idle_injection_cpu_mask)) { ret =allocate_copy_idle_injection_mask (cpu_present_mask);if (ret) - goto skip_limit_set; +return ret; } -if (check_invalid (idle_injection_cpu_mask, new_max_idle)) { - ret = -EINVAL ; - goto skip_limit_set; - } +if (check_invalid (idle_injection_cpu_mask, new_max_idle)) +return -EINVAL ; max_idle = new_max_idle; -skip_limit_set: -mutex_unlock (&powerclamp_lock); -return ret; }
Quoted 19 lines · Thorsten Blum
Use guard(mutex) and return the result of
sysfs_emit()directly to simplify the code. Also use %u to format the unsigned duration.Signed-off-by Thorsten Blum <[email protected]>--- drivers/thermal/intel/intel_powerclamp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)drivers/thermal/intel/intel_powerclamp.c +1
-1@@ -103,13 +103,9 @@ static int duration_set(const char *arg, const struct kernel_param *kp)static int duration_get (char *buf,const struct kernel_param *kp) { -int ret; +guard (mutex)(&powerclamp_lock);
drivers/thermal/intel/intel_powerclamp.c static int duration_set(const char *arg, const struct kernel_param *kp) · line 111
Quoted 10 lines
drivers/thermal/intel/intel_powerclamp.c +1
-5-mutex_lock (&powerclamp_lock); - ret =sysfs_emit (buf,"%d\n" , duration /1000 ); -mutex_unlock (&powerclamp_lock); - -return ret; +return sysfs_emit (buf,"%u\n" , duration /1000 ); }static const struct kernel_param_ops duration_ops = {
Applied as 7.4 material along with the [2/2], thanks!