thermal: intel: int340x: soc_slider: Simplify slider_def_*_set()
PATCH 1/1 thermal: intel: int340x: soc_slider: Simplify slider_def_*_set()
Return errors directly to simplify slider_def_balance_set() and slider_def_offset_set().
Signed-off-by Thorsten Blum <[email protected]>
--- .../processor_thermal_soc_slider.c | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-)
drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c +15 -13
@@ -66,15 +66,16 @@ static int slider_def_balance_set(const char *arg, const struct kernel_param *kpguard (mutex)(&slider_param_lock); ret =kstrtou8 (arg,16 , &slider_val); -if (!ret) { -if (slider_val <= slider_values[SOC_POWER_SLIDER_PERFORMANCE ] || - slider_val >= slider_values[SOC_POWER_SLIDER_POWERSAVE ]) -return -EINVAL ; +if (ret) +return ret; - slider_balanced_param = slider_val; - } +if (slider_val <= slider_values[SOC_POWER_SLIDER_PERFORMANCE ] || + slider_val >= slider_values[SOC_POWER_SLIDER_POWERSAVE ]) +return -EINVAL ; -return ret; + slider_balanced_param = slider_val; + +return 0 ; }static int slider_def_balance_get (char *buf,const struct kernel_param *kp)
@@ -101,14 +102,15 @@ static int slider_def_offset_set(const char *arg, const struct kernel_param *kp)guard (mutex)(&slider_param_lock); ret =kstrtou8 (arg,16 , &offset); -if (!ret) { -if (offset >SOC_SLIDER_VALUE_MAXIMUM ) -return -EINVAL ; +if (ret) +return ret; - slider_offset = offset; - } +if (offset >SOC_SLIDER_VALUE_MAXIMUM ) +return -EINVAL ; -return ret; + slider_offset = offset; + +return 0 ; }static int slider_def_offset_get (char *buf,const struct kernel_param *kp)
Quoted 49 lines · Thorsten Blum
Return errors directly to simplify
slider_def_balance_set()andslider_def_offset_set().Signed-off-by Thorsten Blum <[email protected]>--- .../processor_thermal_soc_slider.c | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-)drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c +10
-12@@ -66,15 +66,16 @@ static int slider_def_balance_set(const char *arg, const struct kernel_param *kpguard (mutex)(&slider_param_lock); ret =kstrtou8 (arg,16 , &slider_val); -if (!ret) { -if (slider_val <= slider_values[SOC_POWER_SLIDER_PERFORMANCE ] || - slider_val >= slider_values[SOC_POWER_SLIDER_POWERSAVE ]) -return -EINVAL ; +if (ret) +return ret; - slider_balanced_param = slider_val; - } +if (slider_val <= slider_values[SOC_POWER_SLIDER_PERFORMANCE ] || + slider_val >= slider_values[SOC_POWER_SLIDER_POWERSAVE ]) +return -EINVAL ; -return ret; + slider_balanced_param = slider_val; + +return 0 ; }static int slider_def_balance_get (char *buf,const struct kernel_param *kp)@@ -101,14 +102,15 @@ static int slider_def_offset_set(const char *arg, const struct kernel_param *kp)guard (mutex)(&slider_param_lock); ret =kstrtou8 (arg,16 , &offset); -if (!ret) { -if (offset >SOC_SLIDER_VALUE_MAXIMUM ) -return -EINVAL ; +if (ret) +return ret; - slider_offset = offset; - }
drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c static int slider_def_offset_set(const char *arg, const struct kernel_param *kp) · line 116
Quoted 10 lines
drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c +5
-1+if (offset >SOC_SLIDER_VALUE_MAXIMUM ) +return -EINVAL ; -return ret; + slider_offset = offset; + +return 0 ; }static int slider_def_offset_get (char *buf,const struct kernel_param *kp)
Applied as 7.4 material, thanks!