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

Commit b5e4ae62 authored by Zhang Rui's avatar Zhang Rui
Browse files

Thermal: List thermal_instance in thermal_cooling_device. 



List thermal_instance in thermal_cooling_device so that
cooling device can know the cooling state requirement
of all the thermal instances.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Reviewed-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
parent cddf31b3

drivers/thermal/thermal_sys.c

+6 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct thermal_instance { 
	char attr_name[THERMAL_NAME_LENGTH];

	struct device_attribute attr;

	struct list_head tz_node; /* node in tz->thermal_instances */

	struct list_head cdev_node; /* node in cdev->thermal_instances */

};



static DEFINE_IDR(thermal_tz_idr);
@@ -878,8 +879,10 @@ int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz, 
		result = -EEXIST;

		break;

	}

	if (!result)

	if (!result) {

		list_add_tail(&dev->tz_node, &tz->thermal_instances);

		list_add_tail(&dev->cdev_node, &cdev->thermal_instances);

	}

	mutex_unlock(&tz->lock);



	if (!result)
@@ -915,6 +918,7 @@ int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz, 
	list_for_each_entry_safe(pos, next, &tz->thermal_instances, tz_node) {

		if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {

			list_del(&pos->tz_node);

			list_del(&pos->cdev_node);

			mutex_unlock(&tz->lock);

			goto unbind;

		}
@@ -984,6 +988,7 @@ thermal_cooling_device_register(char *type, void *devdata, 
	}



	strcpy(cdev->type, type);

	INIT_LIST_HEAD(&cdev->thermal_instances);

	cdev->ops = ops;

	cdev->device.class = &thermal_class;

	cdev->devdata = devdata;

include/linux/thermal.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct thermal_cooling_device { 
	struct device device;

	void *devdata;

	const struct thermal_cooling_device_ops *ops;

	struct list_head thermal_instances;

	struct list_head node;

};