thermal: intel: int340x: Drop redundant else in proc_thermal_add()

[PATCH] thermal: intel: int340x: Drop redundant else in proc_thermal_add()

Posted by Thorsten Blum 1 month, 2 weeks ago

Drop the redundant else branch since ret is immediately overwritten.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 .../thermal/intel/int340x_thermal/processor_thermal_device.c  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
index f80dbe2ca7e4..0a007a6413df 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
@@ -291,10 +291,8 @@ int proc_thermal_add(struct device *dev, struct proc_thermal_device *proc_priv)
 	}
 
 	proc_priv->int340x_zone = int340x_thermal_zone_add(adev, get_temp);
-	if (IS_ERR(proc_priv->int340x_zone)) {
+	if (IS_ERR(proc_priv->int340x_zone))
 		return PTR_ERR(proc_priv->int340x_zone);
-	} else
-		ret = 0;
 
 	ret = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY,
 					  proc_thermal_notify,

Re: [PATCH] thermal: intel: int340x: Drop redundant else in proc_thermal_add()

Posted by Rafael J. Wysocki (Intel) 3 weeks, 3 days ago

On Sat, Aug 15, 2026 at 11:24 AM Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Drop the redundant else branch since ret is immediately overwritten.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  .../thermal/intel/int340x_thermal/processor_thermal_device.c  | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> index f80dbe2ca7e4..0a007a6413df 100644
> --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
> @@ -291,10 +291,8 @@ int proc_thermal_add(struct device *dev, struct proc_thermal_device *proc_priv)
>         }
>
>         proc_priv->int340x_zone = int340x_thermal_zone_add(adev, get_temp);
> -       if (IS_ERR(proc_priv->int340x_zone)) {
> +       if (IS_ERR(proc_priv->int340x_zone))
>                 return PTR_ERR(proc_priv->int340x_zone);
> -       } else
> -               ret = 0;
>
>         ret = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY,
>                                           proc_thermal_notify,

Applied as 7.4 material, thanks!