From patchwork Fri Nov 18 00:03:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 9435555 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0CBCD6047D for ; Fri, 18 Nov 2016 00:08:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0FB62936E for ; Fri, 18 Nov 2016 00:08:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4101293B8; Fri, 18 Nov 2016 00:08:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F0CD2936E for ; Fri, 18 Nov 2016 00:08:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752168AbcKRAGH (ORCPT ); Thu, 17 Nov 2016 19:06:07 -0500 Received: from Galois.linutronix.de ([146.0.238.70]:50317 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751389AbcKRAGF (ORCPT ); Thu, 17 Nov 2016 19:06:05 -0500 Received: from localhost ([127.0.0.1] helo=[127.0.1.1]) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1c7WeW-0000ea-56; Fri, 18 Nov 2016 01:03:36 +0100 Message-Id: <20161117234810.028321676@linutronix.de> User-Agent: quilt/0.63-1 Date: Fri, 18 Nov 2016 00:03:24 -0000 From: Thomas Gleixner To: LKML Cc: Zhang Rui , Eduardo Valentin , linux-pm@vger.kernel.org, Peter Zijlstra , x86@kernel.org, rt@linutronix.de, Borislav Petkov Subject: [patch 02/12] thermal/x86_pkg_temp: Remove redundant package search References: <20161117231435.891545908@linutronix.de> MIME-Version: 1.0 Content-Disposition: inline; filename=thermal-x86_pkg_temp--Remove-redundant-package-search.patch Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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;