Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: Move PCI_VENDOR_ID_VMWARE to pci_ids.h

Move PCI_VENDOR_ID_VMWARE from device-specific files to pci_ids.h.
It is useful to always have access to it, especially when accessing
subsystem_vendor_id on emulated devices.

[bhelgaas: keep pci_ids.h sorted and use lower-case hex]
Signed-off-by: Francesco Ruggeri <fruggeri@arista.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

authored by

Francesco Ruggeri and committed by
Bjorn Helgaas
94e57fea 63ddc0b8

+2 -4
-1
drivers/gpu/drm/vmwgfx/svga_reg.h
··· 35 35 /* 36 36 * PCI device IDs. 37 37 */ 38 - #define PCI_VENDOR_ID_VMWARE 0x15AD 39 38 #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 40 39 41 40 /*
-1
drivers/misc/vmw_vmci/vmci_guest.c
··· 35 35 #include "vmci_driver.h" 36 36 #include "vmci_event.h" 37 37 38 - #define PCI_VENDOR_ID_VMWARE 0x15AD 39 38 #define PCI_DEVICE_ID_VMWARE_VMCI 0x0740 40 39 41 40 #define VMCI_UTIL_NUM_RESOURCES 1
-1
drivers/net/vmxnet3/vmxnet3_int.h
··· 117 117 /* 118 118 * PCI vendor and device IDs. 119 119 */ 120 - #define PCI_VENDOR_ID_VMWARE 0x15AD 121 120 #define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07B0 122 121 #define MAX_ETHERNET_CARDS 10 123 122 #define MAX_PCI_PASSTHRU_DEVICE 6
-1
drivers/scsi/vmw_pvscsi.h
··· 32 32 33 33 #define MASK(n) ((1 << (n)) - 1) /* make an n-bit mask */ 34 34 35 - #define PCI_VENDOR_ID_VMWARE 0x15AD 36 35 #define PCI_DEVICE_ID_VMWARE_PVSCSI 0x07C0 37 36 38 37 /*
+2
include/linux/pci_ids.h
··· 2245 2245 #define PCI_VENDOR_ID_MORETON 0x15aa 2246 2246 #define PCI_DEVICE_ID_RASTEL_2PORT 0x2000 2247 2247 2248 + #define PCI_VENDOR_ID_VMWARE 0x15ad 2249 + 2248 2250 #define PCI_VENDOR_ID_ZOLTRIX 0x15b0 2249 2251 #define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0 2250 2252