Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32fa5ba3 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Zhang Rui
Browse files

thermal: core: Add some new helper functions to free resources 



In order to easily free resources allocated by
'thermal_zone_create_device_groups()' we need 2 new helper functions.

The first one undoes 'thermal_zone_create_device_groups()'.
The 2nd one undoes 'create_trip_attrs()', which is a function called by
'thermal_zone_create_device_groups()'.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent 039f6cf5

drivers/thermal/thermal_core.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,7 @@ int thermal_build_list_of_policies(char *buf); 




/* sysfs I/F */

/* sysfs I/F */

int thermal_zone_create_device_groups(struct thermal_zone_device *, int);

int thermal_zone_create_device_groups(struct thermal_zone_device *, int);

void thermal_zone_destroy_device_groups(struct thermal_zone_device *);

void thermal_cooling_device_setup_sysfs(struct thermal_cooling_device *);

void thermal_cooling_device_setup_sysfs(struct thermal_cooling_device *);

/* used only at binding time */

/* used only at binding time */

ssize_t

ssize_t

drivers/thermal/thermal_sysfs.c

+29 −0
Original line number Original line Diff line number Diff line
@@ -605,6 +605,24 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask) 
	return 0;

	return 0;

}

}





/**

 * destroy_trip_attrs() - destroy attributes for trip points

 * @tz:		the thermal zone device

 *

 * helper function to free resources allocated by create_trip_attrs()

 */

static void destroy_trip_attrs(struct thermal_zone_device *tz)

{

	if (!tz)

		return;



	kfree(tz->trip_type_attrs);

	kfree(tz->trip_temp_attrs);

	if (tz->ops->get_trip_hyst)

		kfree(tz->trip_hyst_attrs);

	kfree(tz->trips_attribute_group.attrs);

}



int thermal_zone_create_device_groups(struct thermal_zone_device *tz,

int thermal_zone_create_device_groups(struct thermal_zone_device *tz,

				      int mask)

				      int mask)

{

{
@@ -637,6 +655,17 @@ int thermal_zone_create_device_groups(struct thermal_zone_device *tz, 
	return 0;

	return 0;

}

}





void thermal_zone_destroy_device_groups(struct thermal_zone_device *tz)

{

	if (!tz)

		return;



	if (tz->trips)

		destroy_trip_attrs(tz);



	kfree(tz->device.groups);

}



/* sys I/F for cooling device */

/* sys I/F for cooling device */

static ssize_t

static ssize_t

thermal_cooling_device_type_show(struct device *dev,

thermal_cooling_device_type_show(struct device *dev,