shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 11:50:43 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "thermal: Add thermal_notifier_list for thermal zone"

Browse Source 
This reverts commit 60b250f9b6.

Change-Id: Idcca12204138da521cca87afea69d52ae795afcf
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
This commit is contained in:
Finley Xiao
2019-04-01 22:02:32 +08:00
committed by Tao Huang
parent 716d661c5e
commit 60feaac72b
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/thermal/thermal_core.c
View File

@@ -615,11 +615,6 @@ void thermal_zone_device_update(struct thermal_zone_device *tz)
thermal_zone_set_trips(tz);
#ifdef CONFIG_ARCH_ROCKCHIP
srcu_notifier_call_chain(&tz->thermal_notifier_list,
tz->temperature, tz);
#endif
for (count = 0; count < tz->trips; count++)
handle_thermal_trip(tz, count);
}
@@ -1887,9 +1882,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
tz = kzalloc(sizeof(struct thermal_zone_device), GFP_KERNEL);
if (!tz)
return ERR_PTR(-ENOMEM);
#ifdef CONFIG_ARCH_ROCKCHIP
srcu_init_notifier_head(&tz->thermal_notifier_list);
#endif
INIT_LIST_HEAD(&tz->thermal_instances);
idr_init(&tz->idr);
mutex_init(&tz->lock);
@@ -2086,9 +2079,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
thermal_set_governor(tz, NULL);
thermal_remove_hwmon_sysfs(tz);
#ifdef CONFIG_ARCH_ROCKCHIP
srcu_cleanup_notifier_head(&tz->thermal_notifier_list);
#endif
release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
idr_destroy(&tz->idr);
mutex_destroy(&tz->lock);

4
include/linux/thermal.h
View File

@@ -183,7 +183,6 @@ struct thermal_attr {
* @lock: lock to protect thermal_instances list
* @node: node in thermal_tz_list (in thermal_core.c)
* @poll_queue: delayed work for polling
* @thermal_notifier_list: list head of thermal notifier
*/
struct thermal_zone_device {
int id;
@@ -214,9 +213,6 @@ struct thermal_zone_device {
struct mutex lock;
struct list_head node;
struct delayed_work poll_queue;
#ifdef CONFIG_ARCH_ROCKCHIP
struct srcu_notifier_head thermal_notifier_list;
#endif
};
/**