* 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