From 2e4bb15a4808a81c1d6c34a06acbb230f16dd6da Mon Sep 17 00:00:00 2001
From: GuEe-GUI <2991707448@qq.com>
Date: Mon, 25 Aug 2025 17:08:16 +0800
Subject: [PATCH 1/2] [DM/THERMAL] Fixup the C99, 6.8.1 Labeled statements p4

Append a null statement for "Any statement may be preceded by a prefix that declares an identifier as a label name."

Signed-off-by: GuEe-GUI <2991707448@qq.com>
---
 components/drivers/thermal/thermal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/drivers/thermal/thermal.c b/components/drivers/thermal/thermal.c
index 7832153f6fd..7a5016dabc0 100644
--- a/components/drivers/thermal/thermal.c
+++ b/components/drivers/thermal/thermal.c
@@ -223,6 +223,7 @@ static void thermal_ofw_setup(struct rt_ofw_node *np, struct rt_thermal_zone_dev
         }
     }
 _end:
+    ;
 }
 #else
 rt_inline void thermal_ofw_setup(struct rt_ofw_node *np, struct rt_thermal_zone_device *zdev)

From 7050619693a57590619bcff137e17b826e8031a1 Mon Sep 17 00:00:00 2001
From: GuEe-GUI <2991707448@qq.com>
Date: Mon, 25 Aug 2025 17:10:04 +0800
Subject: [PATCH 2/2] [DM/THERMAL] Fixup the PWM-FAN remove handle data ptr

Signed-off-by: GuEe-GUI <2991707448@qq.com>
---
 components/drivers/thermal/thermal-cool-pwm-fan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/drivers/thermal/thermal-cool-pwm-fan.c b/components/drivers/thermal/thermal-cool-pwm-fan.c
index d6c25392f18..69a08998969 100644
--- a/components/drivers/thermal/thermal-cool-pwm-fan.c
+++ b/components/drivers/thermal/thermal-cool-pwm-fan.c
@@ -255,7 +255,7 @@ static rt_err_t pwm_fan_cool_probe(struct rt_platform_device *pdev)
 
 static rt_err_t pwm_fan_cool_remove(struct rt_platform_device *pdev)
 {
-    struct pwm_fan_cool *pf_cool = pdev->parent.ofw_node;
+    struct pwm_fan_cool *pf_cool = pdev->parent.user_data;
 
     rt_thermal_cooling_device_unregister(&pf_cool->parent);