From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch 02/12] thermal/x86_pkg_temp: Remove redundant package search Date: Fri, 18 Nov 2016 00:03:24 -0000 Message-ID: <20161117234810.028321676@linutronix.de> References: <20161117231435.891545908@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Return-path: Content-Disposition: inline; filename=thermal-x86_pkg_temp--Remove-redundant-package-search.patch Sender: linux-kernel-owner@vger.kernel.org To: LKML Cc: Zhang Rui , Eduardo Valentin , linux-pm@vger.kernel.org, Peter Zijlstra , x86@kernel.org, rt@linutronix.de, Borislav Petkov List-Id: linux-pm@vger.kernel.org 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 --- drivers/thermal/x86_pkg_temp_thermal.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c @@ -479,10 +479,8 @@ static int pkg_temp_thermal_device_add(u 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_remov --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;