vDPA/ifcvf: reuse pre-defined macros for device ids and vendor ids

This commit would reuse pre-defined macros for ifcvf device ids
and vendor ids

Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Link: https://lore.kernel.org/r/20210510081015.4212-3-lingshan.zhu@intel.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h
index 447f4ad..2996db0 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_base.h
+++ b/drivers/vdpa/ifcvf/ifcvf_base.h
@@ -19,21 +19,9 @@
 #include <uapi/linux/virtio_config.h>
 #include <uapi/linux/virtio_pci.h>
 
-#define N3000_VENDOR_ID                0x1AF4
 #define N3000_DEVICE_ID                0x1041
-#define N3000_SUBSYS_VENDOR_ID 0x8086
 #define N3000_SUBSYS_DEVICE_ID 0x001A
 
-#define C5000X_PL_VENDOR_ID            0x1AF4
-#define C5000X_PL_DEVICE_ID            0x1000
-#define C5000X_PL_SUBSYS_VENDOR_ID     0x8086
-#define C5000X_PL_SUBSYS_DEVICE_ID     0x0001
-
-#define C5000X_PL_BLK_VENDOR_ID                0x1AF4
-#define C5000X_PL_BLK_DEVICE_ID                0x1001
-#define C5000X_PL_BLK_SUBSYS_VENDOR_ID 0x8086
-#define C5000X_PL_BLK_SUBSYS_DEVICE_ID 0x0002
-
 #define IFCVF_NET_SUPPORTED_FEATURES \
                ((1ULL << VIRTIO_NET_F_MAC)                     | \
                 (1ULL << VIRTIO_F_ANY_LAYOUT)                  | \

diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
index 46a992e..916a97d 100644 (file)
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -552,18 +552,21 @@ static void ifcvf_remove(struct pci_dev *pdev)
 }
 
 static struct pci_device_id ifcvf_pci_ids[] = {
-       { PCI_DEVICE_SUB(N3000_VENDOR_ID,
+       /* N3000 network device */
+       { PCI_DEVICE_SUB(PCI_VENDOR_ID_REDHAT_QUMRANET,
                         N3000_DEVICE_ID,
-                        N3000_SUBSYS_VENDOR_ID,
+                        PCI_VENDOR_ID_INTEL,
                         N3000_SUBSYS_DEVICE_ID) },
-       { PCI_DEVICE_SUB(C5000X_PL_VENDOR_ID,
-                        C5000X_PL_DEVICE_ID,
-                        C5000X_PL_SUBSYS_VENDOR_ID,
-                        C5000X_PL_SUBSYS_DEVICE_ID) },
-       { PCI_DEVICE_SUB(C5000X_PL_BLK_VENDOR_ID,
-                        C5000X_PL_BLK_DEVICE_ID,
-                        C5000X_PL_BLK_SUBSYS_VENDOR_ID,
-                        C5000X_PL_BLK_SUBSYS_DEVICE_ID) },
+       /* C5000X-PL network device */
+       { PCI_DEVICE_SUB(PCI_VENDOR_ID_REDHAT_QUMRANET,
+                        VIRTIO_TRANS_ID_NET,
+                        PCI_VENDOR_ID_INTEL,
+                        VIRTIO_ID_NET) },
+       /* C5000X-PL block device */
+       { PCI_DEVICE_SUB(PCI_VENDOR_ID_REDHAT_QUMRANET,
+                        VIRTIO_TRANS_ID_BLOCK,
+                        PCI_VENDOR_ID_INTEL,
+                        VIRTIO_ID_BLOCK) },
 
        { 0 },
 };