Commit 8409fe92 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Wei Liu
Browse files

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: default avatarMichael Kelley <mikelley@microsoft.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com> # pci_ids.h
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20220827130345.1320254-2-vkuznets@redhat.com


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent 22589542

drivers/gpu/drm/hyperv/hyperv_drm_drv.c

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
#define DRIVER_MAJOR 1

#define DRIVER_MINOR 0



#define PCI_VENDOR_ID_MICROSOFT 0x1414

#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353



DEFINE_DRM_GEM_FOPS(hv_fops);



static struct drm_driver hyperv_driver = {

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

+0 −4
Original line number Diff line number Diff line
@@ -1465,10 +1465,6 @@ static void mana_gd_shutdown(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



#ifndef PCI_VENDOR_ID_MICROSOFT

#define PCI_VENDOR_ID_MICROSOFT 0x1414

#endif



static const struct pci_device_id mana_id_table[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_PF_DEVICE_ID) },

	{ PCI_DEVICE(PCI_VENDOR_ID_MICROSOFT, MANA_VF_DEVICE_ID) },

drivers/video/fbdev/hyperv_fb.c

+0 −4
Original line number Diff line number Diff line
@@ -74,10 +74,6 @@ 
#define SYNTHVID_DEPTH_WIN8 32

#define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024)



#define PCI_VENDOR_ID_MICROSOFT 0x1414

#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353





enum pipe_msg_type {

	PIPE_MSG_INVALID,

	PIPE_MSG_DATA,

include/linux/pci_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -2079,6 +2079,9 @@ 
#define PCI_DEVICE_ID_ICE_1712		0x1712

#define PCI_DEVICE_ID_VT1724		0x1724



#define PCI_VENDOR_ID_MICROSOFT		0x1414

#define PCI_DEVICE_ID_HYPERV_VIDEO	0x5353



#define PCI_VENDOR_ID_OXSEMI		0x1415

#define PCI_DEVICE_ID_OXSEMI_12PCI840	0x8403

#define PCI_DEVICE_ID_OXSEMI_PCIe840		0xC000