From patchwork Tue Jun 16 07:26:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 30549 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5G7PEpW004591 for ; Tue, 16 Jun 2009 07:27:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979AbZFPH1O (ORCPT ); Tue, 16 Jun 2009 03:27:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752053AbZFPH1O (ORCPT ); Tue, 16 Jun 2009 03:27:14 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:55817 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751979AbZFPH1N (ORCPT ); Tue, 16 Jun 2009 03:27:13 -0400 Received: from m5.gw.fujitsu.co.jp ([10.0.50.75]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id n5G7RF6Y006789 for (envelope-from kaneshige.kenji@jp.fujitsu.com); Tue, 16 Jun 2009 16:27:15 +0900 Received: from smail (m5 [127.0.0.1]) by outgoing.m5.gw.fujitsu.co.jp (Postfix) with ESMTP id CE3F545DE4D for ; Tue, 16 Jun 2009 16:27:14 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (s5.gw.fujitsu.co.jp [10.0.50.95]) by m5.gw.fujitsu.co.jp (Postfix) with ESMTP id AEF7E45DE4E for ; Tue, 16 Jun 2009 16:27:14 +0900 (JST) Received: from s5.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 922C51DB805A for ; Tue, 16 Jun 2009 16:27:14 +0900 (JST) Received: from m108.s.css.fujitsu.com (m108.s.css.fujitsu.com [10.249.87.108]) by s5.gw.fujitsu.co.jp (Postfix) with ESMTP id 4FA481DB8040 for ; Tue, 16 Jun 2009 16:27:14 +0900 (JST) Received: from m108.css.fujitsu.com (m108 [127.0.0.1]) by m108.s.css.fujitsu.com (Postfix) with ESMTP id 24B22428057; Tue, 16 Jun 2009 16:27:14 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by m108.s.css.fujitsu.com (Postfix) with ESMTP id BCFDD428054; Tue, 16 Jun 2009 16:27:13 +0900 (JST) Message-ID: <4A374942.1000903@jp.fujitsu.com> Date: Tue, 16 Jun 2009 16:26:58 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: "linux-pci@vger.kernel.org" , Jesse Barnes Subject: [PATCH 2/2] PCI: remove redundant __msi_set_enable() References: <4A3748BF.7000803@jp.fujitsu.com> In-Reply-To: <4A3748BF.7000803@jp.fujitsu.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Remove __msi_set_enable() because it's used only by msi_set_enable(). Signed-off-by: Kenji Kaneshige --- drivers/pci/msi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 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 Index: 20090612/drivers/pci/msi.c =================================================================== --- 20090612.orig/drivers/pci/msi.c +++ 20090612/drivers/pci/msi.c @@ -75,10 +75,12 @@ void arch_teardown_msi_irqs(struct pci_d } #endif -static void __msi_set_enable(struct pci_dev *dev, int pos, int enable) +static void msi_set_enable(struct pci_dev *dev, int enable) { + int pos; u16 control; + pos = pci_find_capability(dev, PCI_CAP_ID_MSI); if (pos) { pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control); control &= ~PCI_MSI_FLAGS_ENABLE; @@ -88,11 +90,6 @@ static void __msi_set_enable(struct pci_ } } -static void msi_set_enable(struct pci_dev *dev, int enable) -{ - __msi_set_enable(dev, pci_find_capability(dev, PCI_CAP_ID_MSI), enable); -} - static void msix_set_enable(struct pci_dev *dev, int enable) { int pos;