Skip to content

Commit 8409fe9

Browse files
vittyvkliuw
authored andcommitted
PCI: Move PCI_VENDOR_ID_MICROSOFT/PCI_DEVICE_ID_HYPERV_VIDEO definitions to pci_ids.h
There are already three places in kernel which define PCI_VENDOR_ID_MICROSOFT and two for PCI_DEVICE_ID_HYPERV_VIDEO and there's a need to use these from core VMBus code. Move the defines where they belong. No functional change. Reviewed-by: Michael Kelley <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> # pci_ids.h Signed-off-by: Vitaly Kuznetsov <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Wei Liu <[email protected]>
1 parent 2258954 commit 8409fe9

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

drivers/gpu/drm/hyperv/hyperv_drm_drv.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
#define DRIVER_MAJOR 1
2424
#define DRIVER_MINOR 0
2525

26-
#define PCI_VENDOR_ID_MICROSOFT 0x1414
27-
#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353
28-
2926
DEFINE_DRM_GEM_FOPS(hv_fops);
3027

3128
static struct drm_driver hyperv_driver = {

drivers/net/ethernet/microsoft/mana/gdma_main.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,10 +1465,6 @@ static void mana_gd_shutdown(struct pci_dev *pdev)
14651465
pci_disable_device(pdev);
14661466
}
14671467

1468-
#ifndef PCI_VENDOR_ID_MICROSOFT
1469-
#define PCI_VENDOR_ID_MICROSOFT 0x1414
1470-
#endif
1471-
14721468
static const struct pci_device_id mana_id_table[] = {
14731469
{ PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_PF_DEVICE_ID) },
14741470
{ PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_VF_DEVICE_ID) },

drivers/video/fbdev/hyperv_fb.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
#define SYNTHVID_DEPTH_WIN8 32
7575
#define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024)
7676

77-
#define PCI_VENDOR_ID_MICROSOFT 0x1414
78-
#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353
79-
80-
8177
enum pipe_msg_type {
8278
PIPE_MSG_INVALID,
8379
PIPE_MSG_DATA,

include/linux/pci_ids.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2079,6 +2079,9 @@
20792079
#define PCI_DEVICE_ID_ICE_1712 0x1712
20802080
#define PCI_DEVICE_ID_VT1724 0x1724
20812081

2082+
#define PCI_VENDOR_ID_MICROSOFT 0x1414
2083+
#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353
2084+
20822085
#define PCI_VENDOR_ID_OXSEMI 0x1415
20832086
#define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403
20842087
#define PCI_DEVICE_ID_OXSEMI_PCIe840 0xC000

0 commit comments

Comments
 (0)