diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 6f44695b55c0..104ac56329d4 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -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); diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e132714398c7..aa7efc8f89d1 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -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 }; /**