[PATCH] PCI: Rename PCI_DEVICE_ID_RD890_IOMMU to PCI_DEVICE_ID_ATI_RD890_IOMMU

[PATCH] PCI: Rename PCI_DEVICE_ID_RD890_IOMMU to PCI_DEVICE_ID_ATI_RD890_IOMMU

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

PCI_DEVICE_ID_RD890_IOMMU is a device ID in the ATI vendor ID namespace.
Rename it accordingly and move it to the list of ATI device IDs.  No
functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/iommu/amd/amd_iommu.h | 2 +-
 include/linux/pci_ids.h       | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/iommu/amd/amd_iommu.h b/drivers/iommu/amd/amd_iommu.h
index c160a332ce33..61749d52ba05 100644
--- a/drivers/iommu/amd/amd_iommu.h
+++ b/drivers/iommu/amd/amd_iommu.h
@@ -82,7 +82,7 @@ extern int amd_iommu_complete_ppr(struct pci_dev *pdev, u32 pasid,
 static inline bool is_rd890_iommu(struct pci_dev *pdev)
 {
 	return (pdev->vendor == PCI_VENDOR_ID_ATI) &&
-	       (pdev->device == PCI_DEVICE_ID_RD890_IOMMU);
+	       (pdev->device == PCI_DEVICE_ID_ATI_RD890_IOMMU);
 }
 
 static inline bool iommu_feature(struct amd_iommu *iommu, u64 mask)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index b362d90eb9b0..be2910028e27 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -382,6 +382,8 @@
 #define PCI_DEVICE_ID_ATI_RS350_133     0x7831
 #define PCI_DEVICE_ID_ATI_RS350_166     0x7832
 #define PCI_DEVICE_ID_ATI_RS350_200     0x7833
+/* AMD RD890 Chipset */
+#define PCI_DEVICE_ID_ATI_RD890_IOMMU	0x5a23
 #define PCI_DEVICE_ID_ATI_RS400_100     0x5a30
 #define PCI_DEVICE_ID_ATI_RS400_133     0x5a31
 #define PCI_DEVICE_ID_ATI_RS400_166     0x5a32
@@ -416,9 +418,6 @@
 #define PCI_DEVICE_ID_VLSI_82C147	0x0105
 #define PCI_DEVICE_ID_VLSI_VAS96011	0x0702
 
-/* AMD RD890 Chipset */
-#define PCI_DEVICE_ID_RD890_IOMMU	0x5a23
-
 #define PCI_VENDOR_ID_ADL		0x1005
 #define PCI_DEVICE_ID_ADL_2301		0x2301
 
-- 
2.25.1