lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: Rename pci_enable_ari() to pci_configure_ari()

Browse Source 
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>
This commit is contained in:
Yijing Wang
2013-01-15 11:12:17 +08:00
committed by Bjorn Helgaas
parent b0cc6020e1
commit 31ab247623
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/pci.c
View File

@@ -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 * @dev: the PCI device
* *
* If @dev and its upstream bridge both support ARI, enable ARI in the * If @dev and its upstream bridge both support ARI, enable ARI in the
* bridge. Otherwise, disable ARI in the bridge. * 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; u32 cap;
struct pci_dev *bridge; struct pci_dev *bridge;

2
drivers/pci/pci.h
View File

@@ -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, extern int pci_resource_bar(struct pci_dev *dev, int resno,
enum pci_bar_type *type); enum pci_bar_type *type);
extern int pci_bus_add_child(struct pci_bus *bus); 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 * pci_ari_enabled - query ARI forwarding status
* @bus: the PCI bus * @bus: the PCI bus

2
drivers/pci/probe.c
View File

@@ -1286,7 +1286,7 @@ static void pci_init_capabilities(struct pci_dev *dev)
pci_vpd_pci22_init(dev); pci_vpd_pci22_init(dev);
/* Alternative Routing-ID Forwarding */ /* Alternative Routing-ID Forwarding */
pci_enable_ari(dev); pci_configure_ari(dev);
/* Single Root I/O Virtualization */ /* Single Root I/O Virtualization */
pci_iov_init(dev); pci_iov_init(dev);