From patchwork Tue Jan 15 03:12:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 1974371 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2A7513FE33 for ; Tue, 15 Jan 2013 03:14:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754736Ab3AODOz (ORCPT ); Mon, 14 Jan 2013 22:14:55 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:4731 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912Ab3AODOz (ORCPT ); Mon, 14 Jan 2013 22:14:55 -0500 Received: from 172.24.2.119 (EHLO szxeml208-edg.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id AVQ97014; Tue, 15 Jan 2013 11:14:31 +0800 (CST) Received: from SZXEML456-HUB.china.huawei.com (10.82.67.199) by szxeml208-edg.china.huawei.com (172.24.2.57) with Microsoft SMTP Server (TLS) id 14.1.323.3; Tue, 15 Jan 2013 11:14:28 +0800 Received: from localhost (10.135.76.69) by szxeml456-hub.china.huawei.com (10.82.67.199) with Microsoft SMTP Server id 14.1.323.3; Tue, 15 Jan 2013 11:14:18 +0800 From: Yijing Wang To: Bjorn Helgaas , Yu Zhao CC: Kenji Kaneshige , Scott Murray , Yinghai Lu , , Hanjun Guo , , Yijing Wang Subject: [PATCH -v3 2/7] PCI: Rename pci_enable_ari to pci_configure_ari Date: Tue, 15 Jan 2013 11:12:17 +0800 Message-ID: <1358219542-16880-3-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 In-Reply-To: <1358219542-16880-1-git-send-email-wangyijing@huawei.com> References: <1358219542-16880-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org pci_enable_ari now support enable or disable ARI forwarding. So rename pci_enable_ari() to pci_configure_ari for easy understanding. No functional change. Signed-off-by: Yijing Wang --- drivers/pci/pci.c | 4 ++-- drivers/pci/pci.h | 2 +- drivers/pci/probe.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index a17129f..d921900 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2067,10 +2067,10 @@ void pci_free_cap_save_buffers(struct pci_dev *dev) } /** - * pci_enable_ari - enable ARI forwarding if hardware support it + * pci_configure_ari - enable or disable ARI forwarding * @dev: the PCI device */ -void pci_enable_ari(struct pci_dev *dev) +void pci_configure_ari(struct pci_dev *dev) { u32 cap; struct pci_dev *bridge; diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index e851829..19043cb 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -209,7 +209,7 @@ extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, extern int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type); extern int pci_bus_add_child(struct pci_bus *bus); -extern void pci_enable_ari(struct pci_dev *dev); +extern void pci_configure_ari(struct pci_dev *dev); /** * pci_ari_enabled - query ARI forwarding status * @bus: the PCI bus diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6186f03..7b9e691 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1286,7 +1286,7 @@ static void pci_init_capabilities(struct pci_dev *dev) pci_vpd_pci22_init(dev); /* Alternative Routing-ID Forwarding */ - pci_enable_ari(dev); + pci_configure_ari(dev); /* Single Root I/O Virtualization */ pci_iov_init(dev);