PCI/AER: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI
authorShuah Khan <shuah.khan@hp.com>
Thu, 28 Feb 2013 00:07:05 +0000 (17:07 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 26 Mar 2013 22:21:45 +0000 (16:21 -0600)
Change to remove local PCI_BUS() define and use the new PCI_BUS_NUM()
interface from PCI.

Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
drivers/pci/pcie/aer/aerdrv_core.c

index 564d97f94b6cd4d248b7cdad8b3b4e138144ff97..8ec8b4f485604e384de9bf7eddfe2c97c4cae5d5 100644 (file)
@@ -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;