---

yaml --- r: 358399 b: refs/heads/master c: 31ab247 h: refs/heads/master i: 358397: 8b45f5c 358395: 98a401f 358391: ef91ea2 358383: 7ba8e81 358367: f797d1d 358335: 83a28e3 358271: ac67c13 358143: 8a426b6 357887: 39060d6 357375: 4065b16 356351: 0d2f364 v: v3
git-mirror · Jan 25, 2013 · 13c6cfd · 13c6cfd
1 parent fea2f35
commit 13c6cfd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);