iommu/amd: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI

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>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 98f555dafb55..2a50fbe31c7b 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -649,26 +649,26 @@ retry:
         case EVENT_TYPE_ILL_DEV:
                 printk("ILLEGAL_DEV_TABLE_ENTRY device=%02x:%02x.%x "
                        "address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address, flags);
                 dump_dte_entry(devid);
                 break;
         case EVENT_TYPE_IO_FAULT:
                 printk("IO_PAGE_FAULT device=%02x:%02x.%x "
                        "domain=0x%04x address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        domid, address, flags);
                 break;
         case EVENT_TYPE_DEV_TAB_ERR:
                 printk("DEV_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
                        "address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address, flags);
                 break;
         case EVENT_TYPE_PAGE_TAB_ERR:
                 printk("PAGE_TAB_HARDWARE_ERROR device=%02x:%02x.%x "
                        "domain=0x%04x address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        domid, address, flags);
                 break;
         case EVENT_TYPE_ILL_CMD:
@@ -682,13 +682,13 @@ retry:
         case EVENT_TYPE_IOTLB_INV_TO:
                 printk("IOTLB_INV_TIMEOUT device=%02x:%02x.%x "
                        "address=0x%016llx]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address);
                 break;
         case EVENT_TYPE_INV_DEV_REQ:
                 printk("INVALID_DEVICE_REQUEST device=%02x:%02x.%x "
                        "address=0x%016llx flags=0x%04x]\n",
-                       PCI_BUS(devid), PCI_SLOT(devid), PCI_FUNC(devid),
+                       PCI_BUS_NUM(devid), PCI_SLOT(devid), PCI_FUNC(devid),
                        address, flags);
                 break;
         default: