Skip to contentSkip to conversation

thermal/core: Remove pointless thermal_zone_device_reset() function

PATCH Applied Daniel Lezcano 2 participants 2 messages Dec 22, 2020 – Jan 19, 2021 Thermal

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thermal/core: Remove pointless thermal_zone_device_reset() function

The function thermal_zone_device_reset() is called in the thermal_zone_device_register() which allocates and initialize the structure. The passive field is already zero-ed by the allocation, the function is useless.

Call directly thermal_zone_device_init() instead and thermal_zone_device_reset().

---
 drivers/thermal/thermal_core.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/thermal/thermal_core.c +1 -7
index b2615449b18f..996c038f83a4 100644
@@ -478,12 +478,6 @@ static void thermal_zone_device_init(struct thermal_zone_device *tz)
 		pos->initialized = false;
 }
 
-static void thermal_zone_device_reset(struct thermal_zone_device *tz)
-{
-	tz->passive = 0;
-	thermal_zone_device_init(tz);
-}
-
 static int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
 					enum thermal_device_mode mode)
 {
@@ -1363,7 +1357,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 
 	INIT_DELAYED_WORK(&tz->poll_queue, thermal_zone_device_check);
 
-	thermal_zone_device_reset(tz);
+	thermal_zone_device_init(tz);
 	/* Update the new thermal zone and mark it as already updated. */
 	if (atomic_cmpxchg(&tz->need_update, 1, 0))
 		thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);
Signature · 1 line
2.25.1
#1 lore raw
The following commit has been merged into the thermal/next branch of thermal:

The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     d0df264fbd3c531787dec59c4b3fca854bc7ee49
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//d0df264fbd3c531787dec59c4b3fca854bc7ee49
Author:        Daniel Lezcano <[email protected]>
AuthorDate:    Tue, 22 Dec 2020 19:11:10 +01:00
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Tue, 19 Jan 2021 22:23:49 +01:00

thermal/core: Remove pointless thermal_zone_device_reset() function

The function thermal_zone_device_reset() is called in the thermal_zone_device_register() which allocates and initialize the structure. The passive field is already zero-ed by the allocation, the function is useless.

Call directly thermal_zone_device_init() instead and thermal_zone_device_reset().

---
 drivers/thermal/thermal_core.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/thermal/thermal_core.c +1 -7
index b261544..996c038 100644
@@ -478,12 +478,6 @@ static void thermal_zone_device_init(struct thermal_zone_device *tz)
 		pos->initialized = false;
 }
 
-static void thermal_zone_device_reset(struct thermal_zone_device *tz)
-{
-	tz->passive = 0;
-	thermal_zone_device_init(tz);
-}
-
 static int thermal_zone_device_set_mode(struct thermal_zone_device *tz,
 					enum thermal_device_mode mode)
 {
@@ -1363,7 +1357,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,
 
 	INIT_DELAYED_WORK(&tz->poll_queue, thermal_zone_device_check);
 
-	thermal_zone_device_reset(tz);
+	thermal_zone_device_init(tz);
 	/* Update the new thermal zone and mark it as already updated. */
 	if (atomic_cmpxchg(&tz->need_update, 1, 0))
 		thermal_zone_device_update(tz, THERMAL_EVENT_UNSPECIFIED);