All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] thermal: intel: int340x: soc_slider: Simplify slider_def_*_set()
@ 2026-09-21 14:36 Thorsten Blum
  2026-09-25 19:59 ` Rafael J. Wysocki (Intel)
  0 siblings, 1 reply; 2+ messages in thread
From: Thorsten Blum @ 2026-09-21 14:36 UTC (permalink / raw)
  To: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba,
	Srinivas Pandruvada
  Cc: Thorsten Blum, Rafael J. Wysocki, linux-pm, linux-kernel

Return errors directly to simplify slider_def_balance_set() and
slider_def_offset_set().

Signed-off-by: Thorsten Blum <blum@kernel.org>
---
 .../processor_thermal_soc_slider.c            | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
index 91f291627132..e161b95828e8 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
@@ -66,15 +66,16 @@ static int slider_def_balance_set(const char *arg, const struct kernel_param *kp
 	guard(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)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] thermal: intel: int340x: soc_slider: Simplify slider_def_*_set()
  2026-09-21 14:36 [PATCH] thermal: intel: int340x: soc_slider: Simplify slider_def_*_set() Thorsten Blum
@ 2026-09-25 19:59 ` Rafael J. Wysocki (Intel)
  0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki (Intel) @ 2026-09-25 19:59 UTC (permalink / raw)
  To: Thorsten Blum
  Cc: Rafael J. Wysocki, Daniel Lezcano, Zhang Rui, Lukasz Luba,
	Srinivas Pandruvada, Rafael J. Wysocki, linux-pm, linux-kernel

On Mon, Sep 21, 2026 at 4:39 PM Thorsten Blum <blum@kernel.org> wrote:
>
> Return errors directly to simplify slider_def_balance_set() and
> slider_def_offset_set().
>
> Signed-off-by: Thorsten Blum <blum@kernel.org>
> ---
>  .../processor_thermal_soc_slider.c            | 28 ++++++++++---------
>  1 file changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
> index 91f291627132..e161b95828e8 100644
> --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
> +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_soc_slider.c
> @@ -66,15 +66,16 @@ static int slider_def_balance_set(const char *arg, const struct kernel_param *kp
>         guard(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)

Applied as 7.4 material, thanks!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-09-25 20:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-21 14:36 [PATCH] thermal: intel: int340x: soc_slider: Simplify slider_def_*_set() Thorsten Blum
2026-09-25 19:59 ` Rafael J. Wysocki (Intel)

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.