thermal/drivers/of-thermal: Make of_thermal_destroy_zones static
PATCH 1/2 thermal/drivers/of-thermal: Make of_thermal_destroy_zones static
The function of_thermal_destroy_zones() is only used internally by the of_parse_thermal_zones() for rollbacking in case of error.
Make it static and tag it as an __init function.
Signed-off-by Daniel Lezcano <[email protected]>
--- drivers/thermal/of-thermal.c | 64 +++++++++++++++++----------------- drivers/thermal/thermal_core.h | 2 -- 2 files changed, 32 insertions(+), 34 deletions(-)
drivers/thermal/of-thermal.c +32 -32
@@ -998,6 +998,38 @@ static inline void of_thermal_free_zone(struct __thermal_zone *tz)kfree (tz); } +/** +* of_thermal_destroy_zones - remove all zones parsed and allocated resources +* +* Finds all zones parsed and added to the thermal framework and remove them +* from the system, together with their resources. +* +*/ +static __init void of_thermal_destroy_zones (void ) +{ +struct device_node *np, *child; + + np =of_find_node_by_name (NULL ,"thermal-zones" ); +if (!np) { +pr_debug ("unable to find thermal zones\n" ); +return ; + } + +for_each_available_child_of_node (np, child) { +struct thermal_zone_device *zone; + + zone =thermal_zone_get_zone_by_name (child->name); +if (IS_ERR (zone)) +continue ; + +thermal_zone_device_unregister (zone); +kfree (zone->tzp); +kfree (zone->ops); +of_thermal_free_zone (zone->devdata); + } +of_node_put (np); +} +/** * of_parse_thermal_zones - parse device tree thermal data *
@@ -1087,35 +1119,3 @@ int __init of_parse_thermal_zones(void)return -ENOMEM ; } - -/** -* of_thermal_destroy_zones - remove all zones parsed and allocated resources -* -* Finds all zones parsed and added to the thermal framework and remove them -* from the system, together with their resources. -* -*/ -void of_thermal_destroy_zones (void ) -{ -struct device_node *np, *child; - - np =of_find_node_by_name (NULL ,"thermal-zones" ); -if (!np) { -pr_debug ("unable to find thermal zones\n" ); -return ; - } - -for_each_available_child_of_node (np, child) { -struct thermal_zone_device *zone; - - zone =thermal_zone_get_zone_by_name (child->name); -if (IS_ERR (zone)) -continue ; - -thermal_zone_device_unregister (zone); -kfree (zone->tzp); -kfree (zone->ops); -of_thermal_free_zone (zone->devdata); - } -of_node_put (np); -}
drivers/thermal/thermal_core.h +0 -2
@@ -92,14 +92,12 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,/* device tree support */ #ifdef CONFIG_THERMAL_OF int of_parse_thermal_zones (void ); -void of_thermal_destroy_zones (void );int of_thermal_get_ntrips (struct thermal_zone_device *);bool of_thermal_is_trip_valid (struct thermal_zone_device *,int );const struct thermal_trip *of_thermal_get_trip_points (struct thermal_zone_device *);#else static inline int of_parse_thermal_zones (void ) {return 0 ; } -static inline void of_thermal_destroy_zones (void ) { }static inline int of_thermal_get_ntrips (struct thermal_zone_device *tz) {return 0 ;
Signature · 1 line
2.17.1
PATCH 2/2 thermal/drivers/of-thermal: Move the of_thermal_free_zone() to the init section
The function of_thermal_free_zone() is only used the initialization function which all belonging to the init section.
Move it also to the __init section.
Signed-off-by Daniel Lezcano <[email protected]>
--- drivers/thermal/of-thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/of-thermal.c +1 -1
@@ -977,7 +977,7 @@ __init *thermal_of_build_thermal_zone(struct device_node *np)return ERR_PTR (ret); } -static inline void of_thermal_free_zone (struct __thermal_zone *tz) +static __init void of_thermal_free_zone (struct __thermal_zone *tz) {struct __thermal_bind_params *tbp;int i, j;
Signature · 1 line
2.17.1