提交 89baa56b 编写于 作者: T Thomas Gleixner 提交者: Zhang Rui

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: NThomas Gleixner <tglx@linutronix.de>
Tested-by: NSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: NZhang Rui <rui.zhang@intel.com>
上级 768bd13c
......@@ -479,10 +479,8 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册