History

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/1594195170-11119-1-git-send-email-chenhc@lemote.com Signed-off-by: Huacai Chen <chenhc@lemote.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>

Huacai Chen committed 6 years ago

Commit 2575b2f1 parent c7c337c4 files · +3 −4Browse files

Unified · Split

4 files
  1. drivers/gpu/drm/qxl/qxl_dev.h +0 −2
  2. drivers/net/ethernet/rocker/rocker_hw.h +0 −1
  3. include/linux/pci_ids.h +2 −0
  4. samples/vfio-mdev/mdpy-defs.h +1 −1
drivers/gpu/drm/qxl/qxl_dev.h+0−2
@@ -131,8 +131,6 @@ enum SpiceCursorType { · 130 unmodified lines
131 131
132#pragma pack(push, 1)132#pragma pack(push, 1)
133 133
134#define REDHAT_PCI_VENDOR_ID 0x1b36
135
136/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */134/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */
137#define QXL_DEVICE_ID_STABLE 0x0100135#define QXL_DEVICE_ID_STABLE 0x0100
138 136
drivers/net/ethernet/rocker/rocker_hw.h+0−1
@@ -25,7 +25,6 @@ enum { · 24 unmodified lines
25 25
26#define ROCKER_FP_PORTS_MAX 6226#define ROCKER_FP_PORTS_MAX 62
27 27
28#define PCI_VENDOR_ID_REDHAT 0x1b36
29#define PCI_DEVICE_ID_REDHAT_ROCKER 0x000628#define PCI_DEVICE_ID_REDHAT_ROCKER 0x0006
30 29
31#define ROCKER_PCI_BAR0_SIZE 0x200030#define ROCKER_PCI_BAR0_SIZE 0x2000
include/linux/pci_ids.h+2−0
@@ -2585,6 +2585,8 @@ · 2584 unmodified lines
2585 2585
2586#define PCI_VENDOR_ID_ASMEDIA 0x1b212586#define PCI_VENDOR_ID_ASMEDIA 0x1b21
2587 2587
2588#define PCI_VENDOR_ID_REDHAT 0x1b36
2589
2588#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c362590#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS 0x1c36
2589 2591
2590#define PCI_VENDOR_ID_CIRCUITCO 0x1cc82592#define PCI_VENDOR_ID_CIRCUITCO 0x1cc8
samples/vfio-mdev/mdpy-defs.h+1−1
@@ -9,7 +9,7 @@ · 8 unmodified lines
9 */9 */
10 10
11/* pci ids */11/* pci ids */
12#define MDPY_PCI_VENDOR_ID 0x1b36 /* redhat */12#define MDPY_PCI_VENDOR_ID PCI_VENDOR_ID_REDHAT
13#define MDPY_PCI_DEVICE_ID 0x000f13#define MDPY_PCI_DEVICE_ID 0x000f
14#define MDPY_PCI_SUBVENDOR_ID PCI_SUBVENDOR_ID_REDHAT_QUMRANET14#define MDPY_PCI_SUBVENDOR_ID PCI_SUBVENDOR_ID_REDHAT_QUMRANET
15#define MDPY_PCI_SUBDEVICE_ID PCI_SUBDEVICE_ID_QEMU15#define MDPY_PCI_SUBDEVICE_ID PCI_SUBDEVICE_ID_QEMU