diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-03-29 08:55:26 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-03-29 08:55:26 -0600 |
| commit | 833260631178aa26c70a0b05eabc953f5e47167d (patch) | |
| tree | 40e0daad672d14546cf810bfd77bb1006575a999 /drivers/pci | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| parent | 6f2729bab2cc386bb603698646dacd9ab6297ba0 (diff) | |
| download | linux-3.10-833260631178aa26c70a0b05eabc953f5e47167d.tar.gz linux-3.10-833260631178aa26c70a0b05eabc953f5e47167d.tar.bz2 linux-3.10-833260631178aa26c70a0b05eabc953f5e47167d.zip | |
Merge branch 'pci/shuah-defines' into next
* pci/shuah-defines:
iommu/amd: Remove calc_devid() and use PCI_DEVID() from PCI
iommu/amd: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
PCI/AER: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
PCI: Add PCI_BUS_NUM() and PCI_DEVID() interfaces
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index 564d97f94b6..8ec8b4f4856 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -89,8 +89,6 @@ static int add_error_device(struct aer_err_info *e_info, struct pci_dev *dev) return -ENOSPC; } -#define PCI_BUS(x) (((x) >> 8) & 0xff) - /** * is_error_source - check whether the device is source of reported error * @dev: pointer to pci_dev to be checked @@ -106,7 +104,7 @@ static bool is_error_source(struct pci_dev *dev, struct aer_err_info *e_info) * When bus id is equal to 0, it might be a bad id * reported by root port. */ - if (!nosourceid && (PCI_BUS(e_info->id) != 0)) { + if (!nosourceid && (PCI_BUS_NUM(e_info->id) != 0)) { /* Device ID match? */ if (e_info->id == ((dev->bus->number << 8) | dev->devfn)) return true; |