From b8005b0a3afe1b76d8a8bcadae72cf07c93bfc61 Mon Sep 17 00:00:00 2001 From: Finley Xiao Date: Wed, 24 Apr 2019 21:09:40 +0800 Subject: [PATCH] soc: rockchip: system_monitor: Remove cdev from monitor_dev_info Change-Id: I39b91c670c76f7c31f96988feddb5ed8d6946ad5 Signed-off-by: Finley Xiao --- drivers/soc/rockchip/rockchip_system_monitor.c | 3 +-- include/soc/rockchip/rockchip_system_monitor.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/soc/rockchip/rockchip_system_monitor.c b/drivers/soc/rockchip/rockchip_system_monitor.c index ae20db1fc17b..0b4f3bc6d948 100644 --- a/drivers/soc/rockchip/rockchip_system_monitor.c +++ b/drivers/soc/rockchip/rockchip_system_monitor.c @@ -990,7 +990,7 @@ rockchip_system_monitor_adjust_cdev_state(struct thermal_cooling_device *cdev, down_read(&mdev_list_sem); list_for_each_entry(info, &monitor_dev_list, node) { - if (info->cdev != cdev) + if (cdev->np != info->dev->of_node) continue; monitor_temp_to_state(info, temp, state); break; @@ -1059,7 +1059,6 @@ void rockchip_system_monitor_unregister(struct monitor_dev_info *info) devm_devfreq_unregister_notifier(info->dev, devfreq, &info->devfreq_nb, DEVFREQ_TRANSITION_NOTIFIER); - kfree(info->devp); kfree(info->low_temp_adjust_table); kfree(info->opp_table); diff --git a/include/soc/rockchip/rockchip_system_monitor.h b/include/soc/rockchip/rockchip_system_monitor.h index d35e3671249e..07f3a48ec0b1 100644 --- a/include/soc/rockchip/rockchip_system_monitor.h +++ b/include/soc/rockchip/rockchip_system_monitor.h @@ -47,7 +47,6 @@ struct temp_opp_table { * @devp: Device-specific system monitor profile * @node: Node in monitor_dev_list * @temp_freq_table: Maximum frequency at different temperature - * @cdev: Cooling device pointer * @low_limit: Limit maximum frequency when low temperature, in Hz * @high_limit: Limit maximum frequency when high temperature, in Hz * @max_volt: Maximum voltage in microvolt @@ -76,7 +75,6 @@ struct monitor_dev_info { struct monitor_dev_profile *devp; struct list_head node; struct temp_freq_table *temp_freq_table; - struct thermal_cooling_device *cdev; unsigned long low_limit; unsigned long high_limit; unsigned long max_volt;