PCI: vmd: Use PCI_VDEVICE in device list

Use PCI_VDEVICE to simplify the device table.

Link: https://lore.kernel.org/r/20230120031522.2304439-3-david.e.box@linux.intel.com
Signed-off-by: David E. Box <david.e.box@linux.intel.com>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Reviewed-by: Jon Derrick <jonathan.derrick@linux.dev>
Reviewed-by: Nirmal Patel <nirmal.patel@linux.intel.com>
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>

diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
index 769eede..1fc3f21 100644 (file)
--- a/drivers/pci/controller/vmd.c
+++ b/drivers/pci/controller/vmd.c
@@ -1017,33 +1017,33 @@ static int vmd_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(vmd_dev_pm_ops, vmd_suspend, vmd_resume);
 
 static const struct pci_device_id vmd_ids[] = {
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_201D),
+       {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_201D),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_28C0),
+       {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_28C0),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_CAN_BYPASS_MSI_REMAP,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x467f),
+       {PCI_VDEVICE(INTEL, 0x467f),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_OFFSET_FIRST_VECTOR,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4c3d),
+       {PCI_VDEVICE(INTEL, 0x4c3d),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_OFFSET_FIRST_VECTOR,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa77f),
+       {PCI_VDEVICE(INTEL, 0xa77f),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_OFFSET_FIRST_VECTOR,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7d0b),
+       {PCI_VDEVICE(INTEL, 0x7d0b),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_OFFSET_FIRST_VECTOR,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xad0b),
+       {PCI_VDEVICE(INTEL, 0xad0b),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_OFFSET_FIRST_VECTOR,},
-       {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
+       {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_9A0B),
                .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP |
                                VMD_FEAT_HAS_BUS_RESTRICTIONS |
                                VMD_FEAT_OFFSET_FIRST_VECTOR,},