aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-01-14 22:12:17 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-01-25 11:21:10 -0500
commit31ab247623c541d56b39a0b792cdfe4e94dd2a45 (patch)
tree3838e5dc56b41e1fdeae6e4612a0d2240543d8e9 /drivers/pci
parentb0cc6020e1cc62f1253215f189611b34be4a83c7 (diff)
PCI: Rename pci_enable_ari() to pci_configure_ari()
pci_enable_ari() now supports enabling or disabling ARI forwarding. So rename pci_enable_ari() to pci_configure_ari() for easy understanding. No functional change. [bhelgaas: changelog] Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c4
-rw-r--r--drivers/pci/pci.h2
-rw-r--r--drivers/pci/probe.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8b47f70b7d8f..66eefefbe0c5 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2067,13 +2067,13 @@ void pci_free_cap_save_buffers(struct pci_dev *dev)
2067} 2067}
2068 2068
2069/** 2069/**
2070 * pci_enable_ari - enable ARI forwarding if hardware support it 2070 * pci_configure_ari - enable or disable ARI forwarding
2071 * @dev: the PCI device 2071 * @dev: the PCI device
2072 * 2072 *
2073 * If @dev and its upstream bridge both support ARI, enable ARI in the 2073 * If @dev and its upstream bridge both support ARI, enable ARI in the
2074 * bridge. Otherwise, disable ARI in the bridge. 2074 * bridge. Otherwise, disable ARI in the bridge.
2075 */ 2075 */
2076void pci_enable_ari(struct pci_dev *dev) 2076void pci_configure_ari(struct pci_dev *dev)
2077{ 2077{
2078 u32 cap; 2078 u32 cap;
2079 struct pci_dev *bridge; 2079 struct pci_dev *bridge;
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index e8518292826f..19043cbe097c 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,
209extern int pci_resource_bar(struct pci_dev *dev, int resno, 209extern int pci_resource_bar(struct pci_dev *dev, int resno,
210 enum pci_bar_type *type); 210 enum pci_bar_type *type);
211extern int pci_bus_add_child(struct pci_bus *bus); 211extern int pci_bus_add_child(struct pci_bus *bus);
212extern void pci_enable_ari(struct pci_dev *dev); 212extern void pci_configure_ari(struct pci_dev *dev);
213/** 213/**
214 * pci_ari_enabled - query ARI forwarding status 214 * pci_ari_enabled - query ARI forwarding status
215 * @bus: the PCI bus 215 * @bus: the PCI bus
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6186f03d84f3..7b9e691b95b1 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1286,7 +1286,7 @@ static void pci_init_capabilities(struct pci_dev *dev)
1286 pci_vpd_pci22_init(dev); 1286 pci_vpd_pci22_init(dev);
1287 1287
1288 /* Alternative Routing-ID Forwarding */ 1288 /* Alternative Routing-ID Forwarding */
1289 pci_enable_ari(dev); 1289 pci_configure_ari(dev);
1290 1290
1291 /* Single Root I/O Virtualization */ 1291 /* Single Root I/O Virtualization */
1292 pci_iov_init(dev); 1292 pci_iov_init(dev);