Commit 4e544bac authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bjorn Helgaas
Browse files

PCI: Add pci_dev_id() helper 



In several places in the kernel we find PCI_DEVID used like this:

  PCI_DEVID(dev->bus->number, dev->devfn)

Add a "pci_dev_id(struct pci_dev *dev)" helper to simplify callers.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent e0547c81

drivers/pci/msi.c

+3 −3
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ irq_hw_number_t pci_msi_domain_calc_hwirq(struct pci_dev *dev, 
					  struct msi_desc *desc)

{

	return (irq_hw_number_t)desc->msi_attrib.entry_nr |

		PCI_DEVID(dev->bus->number, dev->devfn) << 11 |

		pci_dev_id(dev) << 11 |

		(pci_domain_nr(dev->bus) & 0xFFFFFFFF) << 27;

}
@@ -1508,7 +1508,7 @@ static int get_msi_id_cb(struct pci_dev *pdev, u16 alias, void *data) 
u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev)

{

	struct device_node *of_node;

	u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);

	u32 rid = pci_dev_id(pdev);



	pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);
@@ -1531,7 +1531,7 @@ u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev) 
struct irq_domain *pci_msi_get_device_domain(struct pci_dev *pdev)

{

	struct irq_domain *dom;

	u32 rid = PCI_DEVID(pdev->bus->number, pdev->devfn);

	u32 rid = pci_dev_id(pdev);



	pci_for_each_dma_alias(pdev, get_msi_id_cb, &rid);

	dom = of_msi_map_get_device_domain(&pdev->dev, rid);

drivers/pci/search.c

+3 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, 
	struct pci_bus *bus;

	int ret;



	ret = fn(pdev, PCI_DEVID(pdev->bus->number, pdev->devfn), data);

	ret = fn(pdev, pci_dev_id(pdev), data);

	if (ret)

		return ret;
@@ -88,9 +88,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, 
					return ret;

				continue;

			case PCI_EXP_TYPE_PCIE_BRIDGE:

				ret = fn(tmp,

					 PCI_DEVID(tmp->bus->number,

						   tmp->devfn), data);

				ret = fn(tmp, pci_dev_id(tmp), data);

				if (ret)

					return ret;

				continue;
@@ -101,9 +99,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, 
					 PCI_DEVID(tmp->subordinate->number,

						   PCI_DEVFN(0, 0)), data);

			else

				ret = fn(tmp,

					 PCI_DEVID(tmp->bus->number,

						   tmp->devfn), data);

				ret = fn(tmp, pci_dev_id(tmp), data);

			if (ret)

				return ret;

		}

include/linux/pci.h

+5 −0
Original line number Diff line number Diff line
@@ -596,6 +596,11 @@ struct pci_bus { 


#define to_pci_bus(n)	container_of(n, struct pci_bus, dev)



static inline u16 pci_dev_id(struct pci_dev *dev)

{

	return PCI_DEVID(dev->bus->number, dev->devfn);

}



/*

 * Returns true if the PCI bus is root (behind host-PCI bridge),

 * false otherwise