From patchwork Fri May 22 14:58:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6465311 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E76A5C0020 for ; Fri, 22 May 2015 14:58:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE22B20498 for ; Fri, 22 May 2015 14:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D08CF20483 for ; Fri, 22 May 2015 14:58:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757057AbbEVO6N (ORCPT ); Fri, 22 May 2015 10:58:13 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:38698 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757202AbbEVO6K (ORCPT ); Fri, 22 May 2015 10:58:10 -0400 Received: by igcau1 with SMTP id au1so34603366igc.1 for ; Fri, 22 May 2015 07:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=1NvbQhNkGoQKZO0jSCBJWVaIxP/J0BN67Q6FMXiiSpo=; b=PuMILI7thC0niuFLITgwnkQLWOZFErDGkpkC/yas7I6NeCk4Qbq64VYImjCkjTNf+c Blxfyy+Bjze1FE5LFnhc2AwrREX7p0MgKi8LpIHJpOlN3WSmt59TOU8pOt2jsxjTk4Vf gdPGCWvjWHWwJTeOQt3JpH5nhvb+3WA1iHoVhDZsmMLurwY3/5kJIHNADVHdYIXaPWxs knmtTxpFm8gMc1dWZ1oaU9kGfRD4qdvDS7bEcihNuObD5SMk3uB/NerAK+NAbY3aaCA1 JXrdF23DdzUycyXmfR0kJsxUg+wsPJx5/2RbXedkxCOlyZtKttMj8y2SLhyjq4Ve3XRb 2cYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=1NvbQhNkGoQKZO0jSCBJWVaIxP/J0BN67Q6FMXiiSpo=; b=j3eCQKh71sYMEa5XAuYV6JDcML/Wgb+0XTgD1NCnYMBupMlMvxBGk0Xddm/cHjkm2d gyjxZHbGmZM2bqvzgn7Mq1OVX56FQqgJ1Nzxyi+6BiA2VV4wjM/l8OLx6hTdJLcnQPPz k9+BdW7xC08A+uPXv7SP4tBlQfT9q5Oh2ePFhbxVTJymHTid2jTu2NWGmAptcufDckSP toiZAbOFYAvx2YDJGJ/ASeXM3SOJomxF+NjbnOREEvPBWHlAHVdq7hS0rQp3qxik/9Ef TtvtJF7kqW9vbpmwxDNU0P9q84WKpfnTyl/DXsCrnlM4x/ydzwHkvPxu39KxO+N8q8An qS8w== X-Gm-Message-State: ALoCoQkXy8LqtaLVJSTwvgEehM3eRPdkFwVxHO6vaeYDFgqubVNJj9sVnnTGC6+xIUaUEwOGR0EC X-Received: by 10.43.135.5 with SMTP id ie5mr10197349icc.78.1432306690001; Fri, 22 May 2015 07:58:10 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id pg7sm4139033igb.6.2015.05.22.07.58.09 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 May 2015 07:58:09 -0700 (PDT) Subject: [PATCH] PCI/ASPM: Drop __pci_disable_link_state() useless "force" parameter To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Yijing Wang , Matthew Garrett Date: Fri, 22 May 2015 09:58:08 -0500 Message-ID: <20150522145807.27123.6007.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After 387d37577fdd ("PCI: Don't clear ASPM bits when the FADT declares it's unsupported"), the "force" parameter to __pci_disable_link_state() is always "false". Remove the "force" parameter and assume it's always false. Signed-off-by: Bjorn Helgaas --- drivers/pci/pcie/aspm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 7d4fcdc..f90d8f2 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -714,8 +714,7 @@ void pcie_aspm_powersave_config_link(struct pci_dev *pdev) up_read(&pci_bus_sem); } -static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem, - bool force) +static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem) { struct pci_dev *parent = pdev->bus->self; struct pcie_link_state *link; @@ -737,7 +736,7 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem, * a similar mechanism using "PciASPMOptOut", which is also * ignored in this situation. */ - if (aspm_disabled && !force) { + if (aspm_disabled) { dev_warn(&pdev->dev, "can't disable ASPM; OS doesn't have ASPM control\n"); return; } @@ -763,7 +762,7 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem, void pci_disable_link_state_locked(struct pci_dev *pdev, int state) { - __pci_disable_link_state(pdev, state, false, false); + __pci_disable_link_state(pdev, state, false); } EXPORT_SYMBOL(pci_disable_link_state_locked); @@ -778,7 +777,7 @@ EXPORT_SYMBOL(pci_disable_link_state_locked); */ void pci_disable_link_state(struct pci_dev *pdev, int state) { - __pci_disable_link_state(pdev, state, true, false); + __pci_disable_link_state(pdev, state, true); } EXPORT_SYMBOL(pci_disable_link_state);