Skip to content

Commit 2575b2f

Browse files
chenhuacaibjorn-helgaas
authored andcommitted
PCI: Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h
Instead of duplicating the PCI_VENDOR_ID_REDHAT definition everywhere, move it to include/linux/pci_ids.h. [bhelgaas: also update MDPY_PCI_VENDOR_ID] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Huacai Chen <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Acked-by: Gerd Hoffmann <[email protected]>
1 parent c7c337c commit 2575b2f

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

drivers/gpu/drm/qxl/qxl_dev.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ enum SpiceCursorType {
131131

132132
#pragma pack(push, 1)
133133

134-
#define REDHAT_PCI_VENDOR_ID 0x1b36
135-
136134
/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */
137135
#define QXL_DEVICE_ID_STABLE 0x0100
138136

drivers/net/ethernet/rocker/rocker_hw.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ enum {
2525

2626
#define ROCKER_FP_PORTS_MAX 62
2727

28-
#define PCI_VENDOR_ID_REDHAT 0x1b36
2928
#define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006
3029

3130
#define ROCKER_PCI_BAR0_SIZE 0x2000

include/linux/pci_ids.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2585,6 +2585,8 @@
25852585

25862586
#define PCI_VENDOR_ID_ASMEDIA 0x1b21
25872587

2588+
#define PCI_VENDOR_ID_REDHAT 0x1b36
2589+
25882590
#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36
25892591

25902592
#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8

samples/vfio-mdev/mdpy-defs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
/* pci ids */
12-
#define MDPY_PCI_VENDOR_ID 0x1b36 /* redhat */
12+
#define MDPY_PCI_VENDOR_ID PCI_VENDOR_ID_REDHAT
1313
#define MDPY_PCI_DEVICE_ID 0x000f
1414
#define MDPY_PCI_SUBVENDOR_ID PCI_SUBVENDOR_ID_REDHAT_QUMRANET
1515
#define MDPY_PCI_SUBDEVICE_ID PCI_SUBDEVICE_ID_QEMU

0 commit comments

Comments
 (0)