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>

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 8b47f70b7d8fbe9b453f958eccb94c94075e7f24..66eefefbe0c548a13dfb7d6406777b564cb448c4 100644 (file)
--- a/drivers/pci/pci.c
+++ b/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/drivers/pci/pci.h b/drivers/pci/pci.h
index e8518292826f0182bc23206f0b7e25fe88de858f..19043cbe097cb29704329ff048cf4ddc72e758ee 100644 (file)
--- 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 6186f03d84f37c8aa696d3df504e722a5cd36b38..7b9e691b95b1804e93be9f03d5322e5bfc223d9e 100644 (file)
--- 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);