From 13c6cfdfa75cf1bfd490bdc5a20e4b167ca7ae78 Mon Sep 17 00:00:00 2001
From: Yijing Wang <wangyijing@huawei.com>
Date: Tue, 15 Jan 2013 11:12:17 +0800
Subject: [PATCH] --- yaml --- r: 358399 b: refs/heads/master c:
 31ab247623c541d56b39a0b792cdfe4e94dd2a45 h: refs/heads/master i:   358397:
 8b45f5c46705be223892d6404a75088fcb73f24c   358395:
 98a401f04c5f56b5223c593fc394e184b45ebcca   358391:
 ef91ea20f61364c5f5cf5f275f7806d8015c910f   358383:
 7ba8e81acd4a16f27ceff039e708fda1955610a7   358367:
 f797d1dc241e5e384352e349a3aec11338207d1e   358335:
 83a28e334b00e9aa74f69851f7dadec795c6d630   358271:
 ac67c131acc7aab0c6d5108b86a558be42cf7d50   358143:
 8a426b6a1e547860c06c0bdb047af4adfdd2fda0   357887:
 39060d6c853344568e172c506ef3657dd28626e4   357375:
 4065b16c421f96fed0030935d69347ecc575fb21   356351:
 0d2f364b8505d37b42a748d7b7f8a1712c859fdf v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pci/pci.c   | 4 ++--
 trunk/drivers/pci/pci.h   | 2 +-
 trunk/drivers/pci/probe.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4862eda0f654..82ad9024ccc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0cc6020e1cc62f1253215f189611b34be4a83c7
+refs/heads/master: 31ab247623c541d56b39a0b792cdfe4e94dd2a45
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 8b47f70b7d8f..66eefefbe0c5 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -2067,13 +2067,13 @@ 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
  *
  * If @dev and its upstream bridge both support ARI, enable ARI in the
  * bridge.  Otherwise, disable ARI in the bridge.
  */
-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/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index e8518292826f..19043cbe097c 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/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/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index 6186f03d84f3..7b9e691b95b1 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/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);