diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-11-22 17:57:05 +0000 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-11-30 10:24:38 +0800 |
| commit | 89baa56be7fad333db0a91198bf4026017ab737d (patch) | |
| tree | a9154ef268c1f2fda4a7a8f89c899a3a52fa993f | |
| parent | 768bd13c93c043a7793dca6d98ba75572bb9b956 (diff) | |
| download | linux-89baa56be7fad333db0a91198bf4026017ab737d.tar.bz2 | |
thermal/x86_pkg_temp: Remove redundant package search
In pkg_temp_thermal_device_remove() the package device is searched at the
beginning of the function. When the device refcount becomes zero another
search for the same device is conducted. Remove the pointless loop and use
the device pointer which was retrieved at the beginning of the function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/x86_pkg_temp_thermal.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c index bbaade89b8ad..95573b2ef201 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -479,10 +479,8 @@ err_ret: static int pkg_temp_thermal_device_remove(unsigned int cpu) { - struct phy_dev_entry *n; + struct phy_dev_entry *phdev = pkg_temp_thermal_get_phy_entry(cpu); u16 phys_proc_id = topology_physical_package_id(cpu); - struct phy_dev_entry *phdev = - pkg_temp_thermal_get_phy_entry(cpu); if (!phdev) return -ENODEV; @@ -503,22 +501,19 @@ static int pkg_temp_thermal_device_remove(unsigned int cpu) --phdev->ref_cnt; pr_debug("thermal_device_remove: pkg: %d cpu %d ref_cnt %d\n", phys_proc_id, cpu, phdev->ref_cnt); - if (!phdev->ref_cnt) - list_for_each_entry_safe(phdev, n, &phy_dev_list, list) { - if (phdev->phys_proc_id == phys_proc_id) { - thermal_zone_device_unregister(phdev->tzone); - /* - * Restore original MSR value for package - * thermal interrupt. - */ - wrmsr_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, - phdev->start_pkg_therm_low, - phdev->start_pkg_therm_high); - list_del(&phdev->list); - kfree(phdev); - break; - } - } + + if (!phdev->ref_cnt) { + thermal_zone_device_unregister(phdev->tzone); + /* + * Restore original MSR value for package thermal + * interrupt. + */ + wrmsr_on_cpu(cpu, MSR_IA32_PACKAGE_THERM_INTERRUPT, + phdev->start_pkg_therm_low, + phdev->start_pkg_therm_high); + list_del(&phdev->list); + kfree(phdev); + } mutex_unlock(&phy_dev_list_mutex); return 0; |