Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31ab2476 authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

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: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent b0cc6020

drivers/pci/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -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);