Index: sys/dev/acpica/acpi_cpu.c =================================================================== --- sys/dev/acpica/acpi_cpu.c +++ sys/dev/acpica/acpi_cpu.c @@ -121,7 +121,6 @@ #define CPU_QUIRK_NO_C3 (1<<0) /* C3-type states are not usable. */ #define CPU_QUIRK_NO_BM_CTRL (1<<2) /* No bus mastering control. */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_DEVICE_82371AB_3 0x7113 /* PIIX4 chipset for quirks. */ #define PCI_REVISION_A_STEP 0 #define PCI_REVISION_B_STEP 1 @@ -1329,7 +1328,7 @@ uint32_t val; ACPI_STATUS status; - acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); + acpi_dev = pci_find_device(PCIV_INTEL, PCI_DEVICE_82371AB_3); if (acpi_dev != NULL) { switch (pci_get_revid(acpi_dev)) { /* Index: sys/dev/acpica/acpi_throttle.c =================================================================== --- sys/dev/acpica/acpi_throttle.c +++ sys/dev/acpica/acpi_throttle.c @@ -82,7 +82,6 @@ #define CPU_P_CNT_THT_EN (1<<4) #define CPU_QUIRK_NO_THROTTLE (1<<1) /* Throttling is not usable. */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_DEVICE_82371AB_3 0x7113 /* PIIX4 chipset for quirks. */ #define PCI_REVISION_A_STEP 0 #define PCI_REVISION_B_STEP 1 @@ -321,7 +320,7 @@ device_t acpi_dev; /* Look for various quirks of the PIIX4 part. */ - acpi_dev = pci_find_device(PCI_VENDOR_INTEL, PCI_DEVICE_82371AB_3); + acpi_dev = pci_find_device(PCIV_INTEL, PCI_DEVICE_82371AB_3); if (acpi_dev) { switch (pci_get_revid(acpi_dev)) { /* Index: sys/dev/bhnd/bhnd_ids.h =================================================================== --- sys/dev/bhnd/bhnd_ids.h +++ sys/dev/bhnd/bhnd_ids.h @@ -75,7 +75,6 @@ #define PCI_VENDOR_3COM 0x10b7 #define PCI_VENDOR_NETGEAR 0x1385 #define PCI_VENDOR_DIAMOND 0x1092 -#define PCI_VENDOR_INTEL 0x8086 #define PCI_VENDOR_DELL 0x1028 #define PCI_VENDOR_HP 0x103c #define PCI_VENDOR_HP_COMPAQ 0x0e11 Index: sys/dev/cpufreq/ichss.c =================================================================== --- sys/dev/cpufreq/ichss.c +++ sys/dev/cpufreq/ichss.c @@ -65,7 +65,6 @@ }; /* Supported PCI IDs. */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_DEV_82801BA 0x244c /* ICH2M */ #define PCI_DEV_82801CA 0x248c /* ICH3M */ #define PCI_DEV_82801DB 0x24cc /* ICH4M */ @@ -160,7 +159,7 @@ */ ich_device = pci_find_bsf(0, 0x1f, 0); if (ich_device == NULL || - pci_get_vendor(ich_device) != PCI_VENDOR_INTEL || + pci_get_vendor(ich_device) != PCIV_INTEL || (pci_get_device(ich_device) != PCI_DEV_82801BA && pci_get_device(ich_device) != PCI_DEV_82801CA && pci_get_device(ich_device) != PCI_DEV_82801DB)) @@ -176,7 +175,7 @@ hostb = pci_find_bsf(0, 0, 0); if (hostb != NULL && - pci_get_vendor(hostb) == PCI_VENDOR_INTEL && + pci_get_vendor(hostb) == PCIV_INTEL && pci_get_device(hostb) == PCI_DEV_82815_MC && pci_get_revid(hostb) < 5) return; Index: sys/dev/e1000/if_em.h =================================================================== --- sys/dev/e1000/if_em.h +++ sys/dev/e1000/if_em.h @@ -223,7 +223,6 @@ /* * Micellaneous constants */ -#define EM_VENDOR_ID 0x8086 #define EM_FLASH 0x0014 #define EM_JUMBO_PBA 0x00000028 Index: sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c =================================================================== --- sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c +++ sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c @@ -2334,7 +2334,6 @@ return DRIVER_UNKNOWN; } -#define PCI_VENDOR_INTEL 0x8086 #define PCI_PRODUCT_PIIX4 0x7111 static void @@ -2353,7 +2352,7 @@ xpt_path_inq(&cpi, path); if (cpi.ccb_h.status == CAM_REQ_CMP && - cpi.hba_vendor == PCI_VENDOR_INTEL && + cpi.hba_vendor == PCIV_INTEL && cpi.hba_device == PCI_PRODUCT_PIIX4) { (*veto)++; if (bootverbose) { Index: sys/dev/ichsmb/ichsmb_pci.c =================================================================== --- sys/dev/ichsmb/ichsmb_pci.c +++ sys/dev/ichsmb/ichsmb_pci.c @@ -67,7 +67,6 @@ #include /* PCI unique identifiers */ -#define PCI_VENDOR_INTEL 0x8086 #define ID_82801AA 0x2413 #define ID_82801AB 0x2423 #define ID_82801BA 0x2443 @@ -199,7 +198,7 @@ { const struct ichsmb_device *device; - if (pci_get_vendor(dev) != PCI_VENDOR_INTEL) + if (pci_get_vendor(dev) != PCIV_INTEL) return (ENXIO); for (device = ichsmb_devices; device->name != NULL; device++) { Index: sys/dev/imcsmb/imcsmb_pci.c =================================================================== --- sys/dev/imcsmb/imcsmb_pci.c +++ sys/dev/imcsmb/imcsmb_pci.c @@ -102,7 +102,6 @@ */ /* PCIe device IDs for (Sandy,Ivy)bridge)-Xeon and (Has,Broad)well-Xeon */ -#define PCI_VENDOR_INTEL 0x8086 #define IMCSMB_PCI_DEV_ID_IMC0_SBX 0x3ca8 #define IMCSMB_PCI_DEV_ID_IMC0_IBX 0x0ea8 #define IMCSMB_PCI_DEV_ID_IMC0_HSX 0x2fa8 @@ -240,7 +239,7 @@ rc = ENXIO; - if (pci_get_vendor(dev) != PCI_VENDOR_INTEL) { + if (pci_get_vendor(dev) != PCIV_INTEL) { goto out; } Index: sys/dev/iwm/if_iwm.c =================================================================== --- sys/dev/iwm/if_iwm.c +++ sys/dev/iwm/if_iwm.c @@ -5608,7 +5608,6 @@ /* * Autoconf glue-sniffing */ -#define PCI_VENDOR_INTEL 0x8086 #define PCI_PRODUCT_INTEL_WL_3160_1 0x08b3 #define PCI_PRODUCT_INTEL_WL_3160_2 0x08b4 #define PCI_PRODUCT_INTEL_WL_3165_1 0x3165 @@ -5646,7 +5645,7 @@ int i; for (i = 0; i < nitems(iwm_devices); i++) { - if (pci_get_vendor(dev) == PCI_VENDOR_INTEL && + if (pci_get_vendor(dev) == PCIV_INTEL && pci_get_device(dev) == iwm_devices[i].device) { device_set_desc(dev, iwm_devices[i].cfg->name); return (BUS_PROBE_DEFAULT); Index: sys/dev/pci/pcireg.h =================================================================== --- sys/dev/pci/pcireg.h +++ sys/dev/pci/pcireg.h @@ -35,7 +35,7 @@ * PCIC_xxx: device class * PCIS_xxx: device subclass * PCIP_xxx: device programming interface - * PCIV_xxx: PCI vendor ID (only required to fixup ancient devices) + * PCIV_xxx: PCI vendor ID * PCID_xxx: device ID * PCIY_xxx: capability identification number * PCIZ_xxx: extended capability identification number @@ -124,6 +124,7 @@ /* PCI Spec rev 2.2: 0FFFFh is an invalid value for Vendor ID. */ #define PCIV_INVALID 0xffff +#define PCIV_INTEL 0x8086 /* Capability Register Offsets */ Index: sys/x86/pci/pci_early_quirks.h =================================================================== --- sys/x86/pci/pci_early_quirks.h +++ sys/x86/pci/pci_early_quirks.h @@ -35,7 +35,6 @@ */ #define PCI_ANY_ID (-1) -#define PCI_VENDOR_INTEL 0x8086 #define PCI_CLASS_VGA 0x0300 #define INTEL_BSM 0x5c Index: sys/x86/pci/pci_early_quirks.c =================================================================== --- sys/x86/pci/pci_early_quirks.c +++ sys/x86/pci/pci_early_quirks.c @@ -254,7 +254,7 @@ return; vendor = pci_cfgregread(bus, slot, func, PCIR_VENDOR, 2); - if (vendor != PCI_VENDOR_INTEL) + if (vendor != PCIV_INTEL) return; class = pci_cfgregread(bus, slot, func, PCIR_SUBCLASS, 2);