src: Make PCI ID define names shorter

Shorten define names containing PCI_{DEVICE,VENDOR}_ID_ with
PCI_{DID,VID}_ using the commands below, which also take care of some
spacing issues. An additional clean up of pci_ids.h is done in
CB:61531.

Used commands:
* find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]\{2\}\([_0-9A-Za-z]\{8\}\)*[_0-9A-Za-z]\{0,5\}\)\t/PCI_\1ID_\3\t\t/g'

* find -type f -exec sed -i 's/PCI_\([DV]\)\(EVICE\|ENDOR\)_ID_\([_0-9A-Za-z]*\)/PCI_\1ID_\3/g'

Change-Id: If9027700f53b6d0d3964c26a41a1f9b8f62be178
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>

src/southbridge/amd/agesa/hudson/hda.c

@@ -20,6 +20,6 @@ static struct device_operations hda_audio_ops = {
 
 static const struct pci_driver hdaaudio_driver __pci_driver = {
 	.ops = &hda_audio_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_HDA,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_HDA,
 };

src/southbridge/amd/agesa/hudson/hudson.c

@@ -44,7 +44,7 @@ void hudson_enable(struct device *dev)
 		if (dev->enabled == 0) {
 			u32 usb_device_id = pci_read_config16(dev, PCI_DEVICE_ID);
 			u8 reg8;
-			if (usb_device_id == PCI_DEVICE_ID_AMD_SB900_USB_20_5) {
+			if (usb_device_id == PCI_DID_AMD_SB900_USB_20_5) {
 				/* turn off and remove device 0:14.5 from PCI space */
 				reg8 = pm_read8(0xef);
 				reg8 &= ~(1 << 6);
@@ -58,12 +58,11 @@ void hudson_enable(struct device *dev)
 			u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID);
 			/* turn off the SDHC controller in the PM reg */
 			u8 reg8;
-			if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) {
+			if (sd_device_id == PCI_DID_AMD_HUDSON_SD) {
 				reg8 = pm_read8(0xe7);
 				reg8 &= ~(1 << 0);
 				pm_write8(0xe7, reg8);
-			}
-			else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) {
+			} else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) {
 				reg8 = pm_read8(0xe8);
 				reg8 &= ~(1 << 0);
 				pm_write8(0xe8, reg8);

src/southbridge/amd/agesa/hudson/ide.c

@@ -19,6 +19,6 @@ static struct device_operations ide_ops = {
 
 static const struct pci_driver ide_driver __pci_driver = {
 	.ops = &ide_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_IDE,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_IDE,
 };

src/southbridge/amd/agesa/hudson/lpc.c

@@ -343,6 +343,6 @@ static struct device_operations lpc_ops = {
 };
 static const struct pci_driver lpc_driver __pci_driver = {
 	.ops = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_LPC,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_LPC,
 };

src/southbridge/amd/agesa/hudson/pci.c

@@ -41,6 +41,6 @@ static struct device_operations pci_ops = {
 
 static const struct pci_driver pci_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCI,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCI,
 };

src/southbridge/amd/agesa/hudson/pcie.c

@@ -25,22 +25,22 @@ static struct device_operations pci_ops = {
 
 static const struct pci_driver pciea_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIEA,
 };
 
 static const struct pci_driver pcieb_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIEB,
 };
 static const struct pci_driver pciec_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIEC,
 };
 static const struct pci_driver pcied_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIED,
 };

src/southbridge/amd/agesa/hudson/sata.c

@@ -53,12 +53,12 @@ static struct device_operations sata_ops = {
 
 static const struct pci_driver sata0_driver __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_SATA,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_SATA,
 };
 
 static const struct pci_driver sata0_driver_ahci __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_SATA_AHCI,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_SATA_AHCI,
 };

src/southbridge/amd/agesa/hudson/sd.c

@@ -46,6 +46,6 @@ static struct device_operations sd_ops = {
 
 static const struct pci_driver sd_driver __pci_driver = {
 	.ops = &sd_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_YANGTZE_SD,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_YANGTZE_SD,
 };

src/southbridge/amd/agesa/hudson/sm.c

@@ -105,6 +105,6 @@ static struct device_operations smbus_ops = {
 };
 static const struct pci_driver smbus_driver __pci_driver = {
 	.ops = &smbus_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_SM,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_SM,
 };

src/southbridge/amd/agesa/hudson/usb.c

@@ -20,18 +20,18 @@ static struct device_operations usb_ops = {
 
 static const struct pci_driver usb_0_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_USB_18_0,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_USB_18_0,
 };
 
 static const struct pci_driver usb_1_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_USB_18_2,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_USB_18_2,
 };
 
 static const struct pci_driver usb_4_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_USB_20_5,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_USB_20_5,
 };

src/southbridge/amd/cimx/sb800/late.c

@@ -150,8 +150,8 @@ static struct device_operations lpc_ops = {
 
 static const struct pci_driver lpc_driver __pci_driver = {
 	.ops = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_LPC,
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_LPC,
 };
 
 static struct device_operations sata_ops = {
@@ -164,19 +164,19 @@ static struct device_operations sata_ops = {
 
 static const struct pci_driver ahci_driver __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_SATA_AHCI,
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_SATA_AHCI,
 };
 
 static const struct pci_driver raid_driver __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID,
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_SATA_RAID,
 };
 static const struct pci_driver raid5_driver __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_SATA_RAID5,
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_SATA_RAID5,
 };
 
 static struct device_operations usb_ops = {
@@ -191,20 +191,20 @@ static struct device_operations usb_ops = {
  */
 static const struct pci_driver usb_ohci123_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_USB_18_0, /* OHCI-USB1, OHCI-USB2, OHCI-USB3 */
 };
 
 static const struct pci_driver usb_ehci123_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_USB_18_2, /* EHCI-USB1, EHCI-USB2, EHCI-USB3 */
 };
 
 static const struct pci_driver usb_ohci4_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_USB_20_5, /* OHCI-USB4 */
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_USB_20_5, /* OHCI-USB4 */
 };
 
 static struct device_operations azalia_ops = {
@@ -216,8 +216,8 @@ static struct device_operations azalia_ops = {
 
 static const struct pci_driver azalia_driver __pci_driver = {
 	.ops = &azalia_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_HDA,
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_HDA,
 };
 
 static struct device_operations gec_ops = {
@@ -229,8 +229,8 @@ static struct device_operations gec_ops = {
 
 static const struct pci_driver gec_driver __pci_driver = {
 	.ops = &gec_ops,
-	.vendor = PCI_VENDOR_ID_ATI,
-	.device = PCI_DEVICE_ID_ATI_SB800_GEC,
+	.vendor = PCI_VID_ATI,
+	.device = PCI_DID_ATI_SB800_GEC,
 };
 
 /**

src/southbridge/amd/pi/hudson/hda.c

@@ -7,8 +7,8 @@
 #include "hudson.h"
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_AMD_SB900_HDA,
-	PCI_DEVICE_ID_AMD_CZ_HDA,
+	PCI_DID_AMD_SB900_HDA,
+	PCI_DID_AMD_CZ_HDA,
 	0
 };
 
@@ -26,6 +26,6 @@ static struct device_operations hda_audio_ops = {
 
 static const struct pci_driver hdaaudio_driver __pci_driver = {
 	.ops = &hda_audio_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
+	.vendor = PCI_VID_AMD,
 	.devices = pci_device_ids,
 };

src/southbridge/amd/pi/hudson/hudson.c

@@ -33,12 +33,11 @@ void hudson_enable(struct device *dev)
 			u32 sd_device_id = pci_read_config16(dev, PCI_DEVICE_ID);
 			/* turn off the SDHC controller in the PM reg */
 			u8 reg8;
-			if (sd_device_id == PCI_DEVICE_ID_AMD_HUDSON_SD) {
+			if (sd_device_id == PCI_DID_AMD_HUDSON_SD) {
 				reg8 = pm_read8(PM_HUD_SD_FLASH_CTRL);
 				reg8 &= ~BIT(0);
 				pm_write8(PM_HUD_SD_FLASH_CTRL, reg8);
-			}
-			else if (sd_device_id == PCI_DEVICE_ID_AMD_YANGTZE_SD) {
+			} else if (sd_device_id == PCI_DID_AMD_YANGTZE_SD) {
 				reg8 = pm_read8(PM_YANG_SD_FLASH_CTRL);
 				reg8 &= ~BIT(0);
 				pm_write8(PM_YANG_SD_FLASH_CTRL, reg8);

src/southbridge/amd/pi/hudson/ide.c

@@ -19,6 +19,6 @@ static struct device_operations ide_ops = {
 
 static const struct pci_driver ide_driver __pci_driver = {
 	.ops = &ide_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_IDE,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_IDE,
 };

src/southbridge/amd/pi/hudson/lpc.c

@@ -355,13 +355,13 @@ static struct device_operations lpc_ops = {
 
 static const unsigned short pci_device_ids[] = {
 	/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
-	PCI_DEVICE_ID_AMD_SB900_LPC,
+	PCI_DID_AMD_SB900_LPC,
 	/* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */
-	PCI_DEVICE_ID_AMD_CZ_LPC,
+	PCI_DID_AMD_CZ_LPC,
 	0
 };
 static const struct pci_driver lpc_driver __pci_driver = {
 	.ops = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
+	.vendor = PCI_VID_AMD,
 	.devices = pci_device_ids,
 };

src/southbridge/amd/pi/hudson/pci.c

@@ -41,6 +41,6 @@ static struct device_operations pci_ops = {
 
 static const struct pci_driver pci_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCI,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCI,
 };

src/southbridge/amd/pi/hudson/pcie.c

@@ -25,22 +25,22 @@ static struct device_operations pci_ops = {
 
 static const struct pci_driver pciea_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIEA,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIEA,
 };
 
 static const struct pci_driver pcieb_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIEB,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIEB,
 };
 static const struct pci_driver pciec_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIEC,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIEC,
 };
 static const struct pci_driver pcied_driver __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_SB900_PCIED,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_SB900_PCIED,
 };

src/southbridge/amd/pi/hudson/sata.c

@@ -52,15 +52,15 @@ static struct device_operations sata_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_AMD_SB900_SATA,
-	PCI_DEVICE_ID_AMD_SB900_SATA_AHCI,
-	PCI_DEVICE_ID_AMD_CZ_SATA,
-	PCI_DEVICE_ID_AMD_CZ_SATA_AHCI,
+	PCI_DID_AMD_SB900_SATA,
+	PCI_DID_AMD_SB900_SATA_AHCI,
+	PCI_DID_AMD_CZ_SATA,
+	PCI_DID_AMD_CZ_SATA_AHCI,
 	0
 };
 
 static const struct pci_driver sata0_driver __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
+	.vendor = PCI_VID_AMD,
 	.devices = pci_device_ids,
 };

src/southbridge/amd/pi/hudson/sd.c

@@ -47,6 +47,6 @@ static struct device_operations sd_ops = {
 
 static const struct pci_driver sd_driver __pci_driver = {
 	.ops = &sd_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = PCI_DEVICE_ID_AMD_YANGTZE_SD,
+	.vendor = PCI_VID_AMD,
+	.device = PCI_DID_AMD_YANGTZE_SD,
 };

src/southbridge/amd/pi/hudson/sm.c

@@ -105,7 +105,7 @@ static struct device_operations smbus_ops = {
 };
 static const struct pci_driver smbus_driver __pci_driver = {
 	.ops = &smbus_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
+	.vendor = PCI_VID_AMD,
 	/* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */
-	.device = PCI_DEVICE_ID_AMD_SB900_SM,
+	.device = PCI_DID_AMD_SB900_SM,
 };

src/southbridge/amd/pi/hudson/usb.c

@@ -19,17 +19,17 @@ static struct device_operations usb_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_AMD_SB900_USB_18_0,
-	PCI_DEVICE_ID_AMD_SB900_USB_18_2,
-	PCI_DEVICE_ID_AMD_SB900_USB_20_5,
-	PCI_DEVICE_ID_AMD_CZ_USB_0,
-	PCI_DEVICE_ID_AMD_CZ_USB_1,
-	PCI_DEVICE_ID_AMD_CZ_USB3_0,
+	PCI_DID_AMD_SB900_USB_18_0,
+	PCI_DID_AMD_SB900_USB_18_2,
+	PCI_DID_AMD_SB900_USB_20_5,
+	PCI_DID_AMD_CZ_USB_0,
+	PCI_DID_AMD_CZ_USB_1,
+	PCI_DID_AMD_CZ_USB3_0,
 	0
 };
 
 static const struct pci_driver usb_0_driver __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
+	.vendor = PCI_VID_AMD,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/azalia.c

@@ -135,6 +135,6 @@ static const unsigned short pci_device_ids[] = { 0x1c20, 0x1e20, 0 };
 
 static const struct pci_driver pch_azalia __pci_driver = {
 	.ops	 = &azalia_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/lpc.c

@@ -692,6 +692,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_lpc __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/me.c

@@ -285,6 +285,6 @@ static struct device_operations device_ops = {
 
 static const struct pci_driver intel_me __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x1c3a,
 };

src/southbridge/intel/bd82x6x/me_8.x.c

@@ -285,7 +285,7 @@ static struct device_operations device_ops = {
 
 static const struct pci_driver intel_me __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x1e3a,
 };
 

src/southbridge/intel/bd82x6x/pci.c

@@ -53,6 +53,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_pci __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/bd82x6x/pcie.c

@@ -249,6 +249,6 @@ static const unsigned short pci_device_ids[] = { 0x1c10, 0x1c12, 0x1c14, 0x1c16,
 
 static const struct pci_driver pch_pcie __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/sata.c

@@ -272,6 +272,6 @@ static const unsigned short pci_device_ids[] = { 0x1c00, 0x1c01, 0x1c02, 0x1c03,
 
 static const struct pci_driver pch_sata __pci_driver = {
 	.ops	 = &sata_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/smbus.c

@@ -44,6 +44,6 @@ static const unsigned short pci_device_ids[] = { 0x1c22, 0x1e22, 0 };
 
 static const struct pci_driver pch_smbus __pci_driver = {
 	.ops	 = &smbus_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/usb_ehci.c

@@ -103,6 +103,6 @@ static const unsigned short pci_device_ids[] = { 0x1c26, 0x1c2d, 0x1e26, 0x1e2d,
 
 static const struct pci_driver pch_usb_ehci __pci_driver = {
 	.ops	 = &usb_ehci_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/bd82x6x/usb_xhci.c

@@ -54,6 +54,6 @@ static const unsigned short pci_device_ids[] = { 0x1e31, 0 };
 
 static const struct pci_driver pch_usb_xhci __pci_driver = {
 	.ops	 = &usb_xhci_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/common/early_smbus.c

@@ -17,7 +17,7 @@ int smbus_enable_iobar(uintptr_t base)
 	const pci_devfn_t dev = PCI_DEV_SMBUS;
 
 	/* Check to make sure we've got the right device. */
-	if (pci_read_config16(dev, PCI_VENDOR_ID) != PCI_VENDOR_ID_INTEL)
+	if (pci_read_config16(dev, PCI_VENDOR_ID) != PCI_VID_INTEL)
 		return -1;
 
 	/* Set SMBus I/O base. */

src/southbridge/intel/i82371eb/bootblock.c

@@ -38,8 +38,8 @@ void bootblock_early_southbridge_init(void)
 	 * But scanning for the PCI IDs (instead of hardcoding
 	 * bus/device/function numbers) works on all boards.
 	 */
-	const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL,
-				       PCI_DEVICE_ID_INTEL_82371AB_ISA), 0);
+	const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL,
+				       PCI_DID_INTEL_82371AB_ISA), 0);
 
 	/* Enable access to the whole ROM, disable ROM write access. */
 	reg16 = pci_read_config16(dev, XBCS);

src/southbridge/intel/i82371eb/early_pm.c

@@ -13,8 +13,8 @@ void enable_pm(void)
 	u16 reg16;
 
 	/* Get the SMBus/PM device of the 82371AB/EB/MB. */
-	const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL,
-				PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0);
+	const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL,
+				PCI_DID_INTEL_82371AB_SMB_ACPI), 0);
 
 	/* Set the PM I/O base. */
 	pci_write_config32(dev, PMBA, DEFAULT_PMBASE | 1);

src/southbridge/intel/i82371eb/early_smbus.c

@@ -25,8 +25,8 @@ int smbus_enable_iobar(uintptr_t base)
 	u16 reg16;
 
 	/* Get the SMBus/PM device of the 82371AB/EB/MB. */
-	const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VENDOR_ID_INTEL,
-				PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI), 0);
+	const pci_devfn_t dev = pci_locate_device(PCI_ID(PCI_VID_INTEL,
+				PCI_DID_INTEL_82371AB_SMB_ACPI), 0);
 
 	/* Set the SMBus I/O base. */
 	pci_write_config32(dev, SMBBA, base | 1);

src/southbridge/intel/i82371eb/ide.c

@@ -148,34 +148,34 @@ static const struct device_operations ide_ops_ab_eb_mb = {
 /* Intel 82371FB (PIIX) */
 static const struct pci_driver ide_driver_fb __pci_driver = {
 	.ops	= &ide_ops_fb_sb,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371FB_IDE,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371FB_IDE,
 };
 
 /* Intel 82371SB (PIIX3) */
 static const struct pci_driver ide_driver_sb __pci_driver = {
 	.ops	= &ide_ops_fb_sb,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371SB_IDE,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371SB_IDE,
 };
 
 /* Intel 82371MX (MPIIX) */
 static const struct pci_driver ide_driver_mx __pci_driver = {
 	.ops	= &ide_ops_fb_sb,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371MX_ISA_IDE,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371MX_ISA_IDE,
 };
 
 /* Intel 82437MX (part of the 430MX chipset) */
 static const struct pci_driver ide_driver_82437mx __pci_driver = {
 	.ops	= &ide_ops_fb_sb,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82437MX_ISA_IDE,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82437MX_ISA_IDE,
 };
 
 /* Intel 82371AB/EB/MB */
 static const struct pci_driver ide_driver_ab_eb_mb __pci_driver = {
 	.ops	= &ide_ops_ab_eb_mb,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371AB_IDE,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371AB_IDE,
 };

src/southbridge/intel/i82371eb/isa.c

@@ -107,12 +107,12 @@ static const struct device_operations isa_ops = {
 
 static const struct pci_driver isa_driver __pci_driver = {
 	.ops	= &isa_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371AB_ISA,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371AB_ISA,
 };
 
 static const struct pci_driver isa_SB_driver __pci_driver = {
 	.ops	= &isa_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371SB_ISA,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371SB_ISA,
 };

src/southbridge/intel/i82371eb/smbus.c

@@ -110,6 +110,6 @@ static const struct device_operations smbus_ops = {
 /* Intel 82371AB/EB/MB */
 static const struct pci_driver smbus_driver __pci_driver = {
 	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371AB_SMB_ACPI,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371AB_SMB_ACPI,
 };

src/southbridge/intel/i82371eb/usb.c

@@ -31,14 +31,14 @@ static const struct device_operations usb_ops = {
 /* Intel 82371SB (PIIX3) */
 static const struct pci_driver usb_driver_sb __pci_driver = {
 	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371SB_USB,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371SB_USB,
 };
 
 /* Intel 82371AB/EB/MB (PIIX4/PIIX4E/PIIX4M) */
 /* The 440MX (82443MX) consists of 82443BX + 82371EB (uses same PCI IDs). */
 static const struct pci_driver usb_driver_ab_eb_mb __pci_driver = {
 	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82371AB_USB,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82371AB_USB,
 };

src/southbridge/intel/i82801dx/ac97.c

@@ -252,12 +252,12 @@ static struct device_operations ac97_modem_ops  = {
 /* 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) */
 static const struct pci_driver i82801db_ac97_audio __pci_driver = {
 	.ops	= &ac97_audio_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_AC97_AUDIO,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82801DB_AC97_AUDIO,
 };
 
 static const struct pci_driver i82801db_ac97_modem __pci_driver = {
 	.ops	= &ac97_modem_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801DB_AC97_MODEM,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82801DB_AC97_MODEM,
 };

src/southbridge/intel/i82801dx/ide.c

@@ -52,13 +52,13 @@ static struct device_operations ide_ops = {
 /* 82801DB */
 static const struct pci_driver i82801db_ide __pci_driver = {
 	.ops = &ide_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.device = 0x24cb,
 };
 
 /* 82801DBM */
 static const struct pci_driver i82801dbm_ide __pci_driver = {
 	.ops = &ide_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.device = 0x24ca,
 };

src/southbridge/intel/i82801dx/lpc.c

@@ -322,13 +322,13 @@ static struct device_operations lpc_ops = {
 /* 82801DB/DBL */
 static const struct pci_driver lpc_driver_db __pci_driver = {
 	.ops = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_LPC,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DB_LPC,
 };
 
 /* 82801DBM */
 static const struct pci_driver lpc_driver_dbm __pci_driver = {
 	.ops = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DBM_LPC,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DBM_LPC,
 };

src/southbridge/intel/i82801dx/pci.c

@@ -28,13 +28,13 @@ static struct device_operations pci_ops = {
 /* 82801DB */
 static const struct pci_driver pci_driver_db __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_PCI,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DB_PCI,
 };
 
 /* 82801DBM/DBL */
 static const struct pci_driver pci_driver_dbm __pci_driver = {
 	.ops = &pci_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DBM_PCI,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DBM_PCI,
 };

src/southbridge/intel/i82801dx/usb.c

@@ -26,20 +26,20 @@ static struct device_operations usb_ops = {
 /* 82801DB/DBL/DBM USB1 */
 static const struct pci_driver usb_driver_1 __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_USB1,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DB_USB1,
 };
 
 /* 82801DB/DBL/DBM USB2 */
 static const struct pci_driver usb_driver_2 __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_USB2,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DB_USB2,
 };
 
 /* 82801DB/DBL/DBM USB3 */
 static const struct pci_driver usb_driver_3 __pci_driver = {
 	.ops = &usb_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_USB3,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DB_USB3,
 };

src/southbridge/intel/i82801dx/usb2.c

@@ -27,6 +27,6 @@ static struct device_operations usb2_ops = {
 /* 82801DB/DBM USB 2.0 */
 static const struct pci_driver usb2_driver __pci_driver = {
 	.ops = &usb2_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801DB_EHCI,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801DB_EHCI,
 };

src/southbridge/intel/i82801gx/ac97.c

@@ -255,7 +255,7 @@ static struct device_operations ac97_modem_ops = {
 /* Note: 82801GU (ICH7-U) doesn't have AC97 audio. */
 static const struct pci_driver i82801gx_ac97_audio __pci_driver = {
 	.ops	= &ac97_audio_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27de,
 };
 
@@ -263,6 +263,6 @@ static const struct pci_driver i82801gx_ac97_audio __pci_driver = {
 /* Note: 82801GU (ICH7-U) doesn't have AC97 modem. */
 static const struct pci_driver i82801gx_ac97_modem __pci_driver = {
 	.ops	= &ac97_modem_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27dd,
 };

src/southbridge/intel/i82801gx/azalia.c

@@ -111,6 +111,6 @@ static struct device_operations azalia_ops = {
 /* 82801GB/GR/GDH/GBM/GHM (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH) */
 static const struct pci_driver i82801gx_azalia __pci_driver = {
 	.ops	= &azalia_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27d8,
 };

src/southbridge/intel/i82801gx/ide.c

@@ -88,6 +88,6 @@ static struct device_operations ide_ops = {
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gx_ide __pci_driver = {
 	.ops	= &ide_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27df,
 };

src/southbridge/intel/i82801gx/lpc.c

@@ -483,6 +483,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver ich7_lpc __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/i82801gx/pci.c

@@ -47,7 +47,7 @@ static struct device_operations device_ops = {
 /* 82801BA/CA/DB/EB/ER/FB/FR/FW/FRW/GB/GR/GDH/HB/IB/6300ESB/i3100 */
 static const struct pci_driver i82801g_pci __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x244e,
 };
 
@@ -55,6 +55,6 @@ static const struct pci_driver i82801g_pci __pci_driver = {
 /* 82801BAM/CAM/DBL/DBM/FBM/GBM/GHM/GU/HBM/HEM */
 static const struct pci_driver i82801gmu_pci __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x2448,
 };

src/southbridge/intel/i82801gx/pcie.c

@@ -228,6 +228,6 @@ static const unsigned short i82801gx_pcie_ids[] = {
 
 static const struct pci_driver i82801gx_pcie __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= i82801gx_pcie_ids,
 };

src/southbridge/intel/i82801gx/sata.c

@@ -219,6 +219,6 @@ static const unsigned short sata_ids[] = {
 
 static const struct pci_driver i82801gx_sata_driver __pci_driver = {
 	.ops		= &sata_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= sata_ids,
 };

src/southbridge/intel/i82801gx/smbus.c

@@ -23,6 +23,6 @@ static struct device_operations smbus_ops = {
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gx_smbus __pci_driver = {
 	.ops	= &smbus_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27da,
 };

src/southbridge/intel/i82801gx/usb.c

@@ -35,27 +35,27 @@ static struct device_operations usb_ops = {
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gb_usb1 __pci_driver = {
 	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27c8,
 };
 
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gb_usb2 __pci_driver = {
 	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27c9,
 };
 
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gb_usb3 __pci_driver = {
 	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27ca,
 };
 
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gb_usb4 __pci_driver = {
 	.ops	= &usb_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27cb,
 };

src/southbridge/intel/i82801gx/usb_ehci.c

@@ -66,6 +66,6 @@ static struct device_operations usb_ehci_ops = {
 /* 82801GB/GR/GDH/GBM/GHM/GU (ICH7/ICH7R/ICH7DH/ICH7-M/ICH7-M DH/ICH7-U) */
 static const struct pci_driver i82801gx_usb_ehci __pci_driver = {
 	.ops	= &usb_ehci_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.device	= 0x27cc,
 };

src/southbridge/intel/i82801ix/azalia.c

@@ -92,6 +92,6 @@ static struct device_operations azalia_ops = {
 /* ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M */
 static const struct pci_driver i82801ix_azalia __pci_driver = {
 	.ops	= &azalia_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801IB_HD_AUDIO,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82801IB_HD_AUDIO,
 };

src/southbridge/intel/i82801ix/lpc.c

@@ -465,17 +465,17 @@ static struct device_operations device_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_82801IH_LPC,   /* ICH9DH  */
-	PCI_DEVICE_ID_INTEL_82801IO_LPC,   /* ICH9DO  */
-	PCI_DEVICE_ID_INTEL_82801IR_LPC,   /* ICH9R   */
-	PCI_DEVICE_ID_INTEL_82801IEM_LPC,  /* ICH9M-E */
-	PCI_DEVICE_ID_INTEL_82801IB_LPC,   /* ICH9    */
-	PCI_DEVICE_ID_INTEL_82801IBM_LPC,  /* ICH9M   */
+	PCI_DID_INTEL_82801IH_LPC,   /* ICH9DH  */
+	PCI_DID_INTEL_82801IO_LPC,   /* ICH9DO  */
+	PCI_DID_INTEL_82801IR_LPC,   /* ICH9R   */
+	PCI_DID_INTEL_82801IEM_LPC,  /* ICH9M-E */
+	PCI_DID_INTEL_82801IB_LPC,   /* ICH9    */
+	PCI_DID_INTEL_82801IBM_LPC,  /* ICH9M   */
 	0
 };
 
 static const struct pci_driver ich9_lpc __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801ix/pci.c

@@ -44,6 +44,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver ich9_pci __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801ix/pcie.c

@@ -82,16 +82,16 @@ static struct device_operations device_ops = {
 
 /* 82801Ix (ICH9DH/ICH9DO/ICH9R/ICH9/ICH9M-E/ICH9M) */
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_82801IB_PCIE1, /* Port 1 */
-	PCI_DEVICE_ID_INTEL_82801IB_PCIE2, /* Port 2 */
-	PCI_DEVICE_ID_INTEL_82801IB_PCIE3, /* Port 3 */
-	PCI_DEVICE_ID_INTEL_82801IB_PCIE4, /* Port 4 */
-	PCI_DEVICE_ID_INTEL_82801IB_PCIE5, /* Port 5 */
-	PCI_DEVICE_ID_INTEL_82801IB_PCIE6, /* Port 6 */
+	PCI_DID_INTEL_82801IB_PCIE1, /* Port 1 */
+	PCI_DID_INTEL_82801IB_PCIE2, /* Port 2 */
+	PCI_DID_INTEL_82801IB_PCIE3, /* Port 3 */
+	PCI_DID_INTEL_82801IB_PCIE4, /* Port 4 */
+	PCI_DID_INTEL_82801IB_PCIE5, /* Port 5 */
+	PCI_DID_INTEL_82801IB_PCIE6, /* Port 6 */
 	0
 };
 static const struct pci_driver ich9_pcie __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801ix/sata.c

@@ -140,8 +140,8 @@ static void sata_init(struct device *const dev)
 	const config_t *const config = dev->chip_info;
 
 	const u16 devid = pci_read_config16(dev, PCI_DEVICE_ID);
-	const int is_mobile = (devid == PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01) ||
-			      (devid == PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145);
+	const int is_mobile = (devid == PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01) ||
+			      (devid == PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145);
 
 	printk(BIOS_DEBUG, "i82801ix_sata: initializing...\n");
 
@@ -251,17 +251,17 @@ static struct device_operations sata_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_82801IB_SATA_P0123,
-	PCI_DEVICE_ID_INTEL_82801IB_SATA_P01,
-	PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI1,
-	PCI_DEVICE_ID_INTEL_82801IB_SATA_AHCI2,
-	PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_IDE_P01,
-	PCI_DEVICE_ID_INTEL_82801IBM_IEM_SATA_AHCI_P0145,
+	PCI_DID_INTEL_82801IB_SATA_P0123,
+	PCI_DID_INTEL_82801IB_SATA_P01,
+	PCI_DID_INTEL_82801IB_SATA_AHCI1,
+	PCI_DID_INTEL_82801IB_SATA_AHCI2,
+	PCI_DID_INTEL_82801IBM_IEM_SATA_IDE_P01,
+	PCI_DID_INTEL_82801IBM_IEM_SATA_AHCI_P0145,
 	0,
 };
 
 static const struct pci_driver pch_sata __pci_driver = {
 	.ops	 = &sata_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/i82801ix/smbus.c

@@ -29,6 +29,6 @@ static struct device_operations smbus_ops = {
 
 static const struct pci_driver pch_smbus __pci_driver = {
 	.ops	 = &smbus_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82801IB_SMB,
+	.vendor	 = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82801IB_SMB,
 };

src/southbridge/intel/i82801ix/thermal.c

@@ -43,6 +43,6 @@ static struct device_operations device_ops = {
 
 static const struct pci_driver ich9_thermal __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
-	.device	= PCI_DEVICE_ID_INTEL_82801IB_THERMAL,
+	.vendor	= PCI_VID_INTEL,
+	.device	= PCI_DID_INTEL_82801IB_THERMAL,
 };

src/southbridge/intel/i82801ix/usb_ehci.c

@@ -33,8 +33,8 @@ static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor,
 }
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_82801IB_EHCI1,
-	PCI_DEVICE_ID_INTEL_82801IB_EHCI2,
+	PCI_DID_INTEL_82801IB_EHCI1,
+	PCI_DID_INTEL_82801IB_EHCI2,
 	0
 };
 
@@ -52,6 +52,6 @@ static struct device_operations usb_ehci_ops = {
 
 static const struct pci_driver pch_usb_ehci1 __pci_driver = {
 	.ops	= &usb_ehci_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/i82801jx/azalia.c

@@ -97,6 +97,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver i82801jx_azalia __pci_driver = {
 	.ops	= &azalia_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801jx/lpc.c

@@ -500,6 +500,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver ich10_lpc __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801jx/pci.c

@@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver ich10_pci __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801jx/pcie.c

@@ -100,6 +100,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver ich10_pcie __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801jx/sata.c

@@ -242,6 +242,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_sata __pci_driver = {
 	.ops	 = &sata_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/i82801jx/smbus.c

@@ -36,6 +36,6 @@ static const unsigned short pci_device_ids[] =
 
 static const struct pci_driver pch_smbus __pci_driver = {
 	.ops	 = &smbus_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/i82801jx/thermal.c

@@ -46,6 +46,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver ich10_thermal __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };

src/southbridge/intel/i82801jx/usb_ehci.c

@@ -54,6 +54,6 @@ static struct device_operations usb_ehci_ops = {
 
 static const struct pci_driver pch_usb_ehci1 __pci_driver = {
 	.ops	= &usb_ehci_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/i82870/ioapic.c

@@ -73,7 +73,7 @@ static struct device_operations ioapic_ops = {
 
 static const struct pci_driver ioapic_driver __pci_driver = {
 	.ops    = &ioapic_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82870_1E0,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82870_1E0,
 
 };

src/southbridge/intel/i82870/pcibridge.c

@@ -33,8 +33,8 @@ static struct device_operations pcix_ops  = {
 
 static const struct pci_driver pcix_driver __pci_driver = {
 	.ops    = &pcix_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_82870_1F0,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_82870_1F0,
 };
 
 struct chip_operations southbridge_intel_i82870_ops = {

src/southbridge/intel/ibexpeak/azalia.c

@@ -123,6 +123,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_azalia __pci_driver = {
 	.ops	 = &azalia_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/ibexpeak/lpc.c

@@ -568,6 +568,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_lpc __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/ibexpeak/me.c

@@ -523,6 +523,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver intel_me __pci_driver = {
 	.ops	= &device_ops,
-	.vendor	= PCI_VENDOR_ID_INTEL,
+	.vendor	= PCI_VID_INTEL,
 	.devices	= pci_device_ids
 };

src/southbridge/intel/ibexpeak/sata.c

@@ -211,6 +211,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_sata __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/ibexpeak/smbus.c

@@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_smbus __pci_driver = {
 	.ops	 = &smbus_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/ibexpeak/thermal.c

@@ -41,6 +41,6 @@ static struct device_operations thermal_ops = {
 
 static const struct pci_driver pch_thermal __pci_driver = {
 	.ops = &thermal_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.device = PCI_DID_INTEL_IBEXPEAK_THERMAL,
 };

src/southbridge/intel/ibexpeak/usb_ehci.c

@@ -86,6 +86,6 @@ static const unsigned short pci_device_ids[] = {
 
 static const struct pci_driver pch_usb_ehci __pci_driver = {
 	.ops = &usb_ehci_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/azalia.c

@@ -121,13 +121,13 @@ static struct device_operations azalia_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_AUDIO,
-	PCI_DEVICE_ID_INTEL_LPT_LP_AUDIO,
+	PCI_DID_INTEL_LPT_H_AUDIO,
+	PCI_DID_INTEL_LPT_LP_AUDIO,
 	0
 };
 
 static const struct pci_driver pch_azalia __pci_driver = {
 	.ops	 = &azalia_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/lpc.c

@@ -816,30 +816,30 @@ static struct device_operations device_ops = {
 
 /* IDs for LPC device of Intel 8 Series Chipset (Lynx Point) */
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_MOBILE_SAMPLE,
-	PCI_DEVICE_ID_INTEL_LPT_DESKTOP_SAMPLE,
-	PCI_DEVICE_ID_INTEL_LPT_Z87,
-	PCI_DEVICE_ID_INTEL_LPT_Z85,
-	PCI_DEVICE_ID_INTEL_LPT_HM86,
-	PCI_DEVICE_ID_INTEL_LPT_H87,
-	PCI_DEVICE_ID_INTEL_LPT_HM87,
-	PCI_DEVICE_ID_INTEL_LPT_Q85,
-	PCI_DEVICE_ID_INTEL_LPT_Q87,
-	PCI_DEVICE_ID_INTEL_LPT_QM87,
-	PCI_DEVICE_ID_INTEL_LPT_B85,
-	PCI_DEVICE_ID_INTEL_LPT_C222,
-	PCI_DEVICE_ID_INTEL_LPT_C224,
-	PCI_DEVICE_ID_INTEL_LPT_C226,
-	PCI_DEVICE_ID_INTEL_LPT_H81,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SAMPLE,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PREMIUM,
-	PCI_DEVICE_ID_INTEL_LPT_LP_MAINSTREAM,
-	PCI_DEVICE_ID_INTEL_LPT_LP_VALUE,
+	PCI_DID_INTEL_LPT_MOBILE_SAMPLE,
+	PCI_DID_INTEL_LPT_DESKTOP_SAMPLE,
+	PCI_DID_INTEL_LPT_Z87,
+	PCI_DID_INTEL_LPT_Z85,
+	PCI_DID_INTEL_LPT_HM86,
+	PCI_DID_INTEL_LPT_H87,
+	PCI_DID_INTEL_LPT_HM87,
+	PCI_DID_INTEL_LPT_Q85,
+	PCI_DID_INTEL_LPT_Q87,
+	PCI_DID_INTEL_LPT_QM87,
+	PCI_DID_INTEL_LPT_B85,
+	PCI_DID_INTEL_LPT_C222,
+	PCI_DID_INTEL_LPT_C224,
+	PCI_DID_INTEL_LPT_C226,
+	PCI_DID_INTEL_LPT_H81,
+	PCI_DID_INTEL_LPT_LP_SAMPLE,
+	PCI_DID_INTEL_LPT_LP_PREMIUM,
+	PCI_DID_INTEL_LPT_LP_MAINSTREAM,
+	PCI_DID_INTEL_LPT_LP_VALUE,
 	0
 };
 
 static const struct pci_driver pch_lpc __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/me.c

@@ -920,13 +920,13 @@ static struct device_operations device_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_MEI,
-	PCI_DEVICE_ID_INTEL_LPT_LP_MEI,
+	PCI_DID_INTEL_LPT_H_MEI,
+	PCI_DID_INTEL_LPT_LP_MEI,
 	0
 };
 
 static const struct pci_driver intel_me __pci_driver = {
 	.ops     = &device_ops,
-	.vendor  = PCI_VENDOR_ID_INTEL,
+	.vendor  = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/pcie.c

@@ -38,7 +38,7 @@ static struct root_port_config rpc;
 
 static inline int max_root_ports(void)
 {
-	if (pch_is_lp() || pch_silicon_id() == PCI_DEVICE_ID_INTEL_LPT_H81)
+	if (pch_is_lp() || pch_silicon_id() == PCI_DID_INTEL_LPT_H81)
 		return 6;
 
 	return 8;
@@ -749,25 +749,25 @@ static struct device_operations device_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP1,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP2,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP3,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP4,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP5,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP6,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP7,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP8,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP1,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP2,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP3,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP4,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP5,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP6,
+	PCI_DID_INTEL_LPT_H_PCIE_RP1,
+	PCI_DID_INTEL_LPT_H_PCIE_RP2,
+	PCI_DID_INTEL_LPT_H_PCIE_RP3,
+	PCI_DID_INTEL_LPT_H_PCIE_RP4,
+	PCI_DID_INTEL_LPT_H_PCIE_RP5,
+	PCI_DID_INTEL_LPT_H_PCIE_RP6,
+	PCI_DID_INTEL_LPT_H_PCIE_RP7,
+	PCI_DID_INTEL_LPT_H_PCIE_RP8,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP1,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP2,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP3,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP4,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP5,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP6,
 	0
 };
 
 static const struct pci_driver pch_pcie __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/sata.c

@@ -219,27 +219,27 @@ static struct device_operations sata_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE,
-	PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_AHCI,
-	PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_1,
-	PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM,
-	PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45,
-	PCI_DEVICE_ID_INTEL_LPT_H_DESKTOP_SATA_RAID_2,
-	PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE,
-	PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_AHCI,
-	PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_1,
-	PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM,
-	PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_IDE_P45,
-	PCI_DEVICE_ID_INTEL_LPT_H_MOBILE_SATA_RAID_2,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SATA_AHCI,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_1,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_PREM,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SATA_RAID_2,
+	PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE,
+	PCI_DID_INTEL_LPT_H_DESKTOP_SATA_AHCI,
+	PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_1,
+	PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_PREM,
+	PCI_DID_INTEL_LPT_H_DESKTOP_SATA_IDE_P45,
+	PCI_DID_INTEL_LPT_H_DESKTOP_SATA_RAID_2,
+	PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE,
+	PCI_DID_INTEL_LPT_H_MOBILE_SATA_AHCI,
+	PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_1,
+	PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_PREM,
+	PCI_DID_INTEL_LPT_H_MOBILE_SATA_IDE_P45,
+	PCI_DID_INTEL_LPT_H_MOBILE_SATA_RAID_2,
+	PCI_DID_INTEL_LPT_LP_SATA_AHCI,
+	PCI_DID_INTEL_LPT_LP_SATA_RAID_1,
+	PCI_DID_INTEL_LPT_LP_SATA_RAID_PREM,
+	PCI_DID_INTEL_LPT_LP_SATA_RAID_2,
 	0
 };
 
 static const struct pci_driver pch_sata __pci_driver = {
 	.ops	 = &sata_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/serialio.c

@@ -259,19 +259,19 @@ static struct device_operations device_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_LP_SDMA,
-	PCI_DEVICE_ID_INTEL_LPT_LP_I2C0,
-	PCI_DEVICE_ID_INTEL_LPT_LP_I2C1,
-	PCI_DEVICE_ID_INTEL_LPT_LP_GSPI0,
-	PCI_DEVICE_ID_INTEL_LPT_LP_GSPI1,
-	PCI_DEVICE_ID_INTEL_LPT_LP_UART0,
-	PCI_DEVICE_ID_INTEL_LPT_LP_UART1,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SD,
+	PCI_DID_INTEL_LPT_LP_SDMA,
+	PCI_DID_INTEL_LPT_LP_I2C0,
+	PCI_DID_INTEL_LPT_LP_I2C1,
+	PCI_DID_INTEL_LPT_LP_GSPI0,
+	PCI_DID_INTEL_LPT_LP_GSPI1,
+	PCI_DID_INTEL_LPT_LP_UART0,
+	PCI_DID_INTEL_LPT_LP_UART1,
+	PCI_DID_INTEL_LPT_LP_SD,
 	0
 };
 
 static const struct pci_driver pch_pcie __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/smbus.c

@@ -34,14 +34,14 @@ static struct device_operations smbus_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_SMBUS,
-	PCI_DEVICE_ID_INTEL_LPT_LP_SMBUS,
-	PCI_DEVICE_ID_INTEL_WPT_LP_SMBUS,
+	PCI_DID_INTEL_LPT_H_SMBUS,
+	PCI_DID_INTEL_LPT_LP_SMBUS,
+	PCI_DID_INTEL_WPT_LP_SMBUS,
 	0
 };
 
 static const struct pci_driver pch_smbus __pci_driver = {
 	.ops	 = &smbus_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };

src/southbridge/intel/lynxpoint/usb_ehci.c

@@ -170,15 +170,15 @@ static struct device_operations usb_ehci_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_LP_EHCI,
-	PCI_DEVICE_ID_INTEL_LPT_H_EHCI_1,
-	PCI_DEVICE_ID_INTEL_LPT_H_EHCI_2,
+	PCI_DID_INTEL_LPT_LP_EHCI,
+	PCI_DID_INTEL_LPT_H_EHCI_1,
+	PCI_DID_INTEL_LPT_H_EHCI_2,
 	0
 };
 
 static const struct pci_driver pch_usb_ehci __pci_driver = {
 	.ops	 = &usb_ehci_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
 

src/southbridge/intel/lynxpoint/usb_xhci.c

@@ -342,14 +342,14 @@ static struct device_operations usb_xhci_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_XHCI,
-	PCI_DEVICE_ID_INTEL_LPT_LP_XHCI,
+	PCI_DID_INTEL_LPT_H_XHCI,
+	PCI_DID_INTEL_LPT_LP_XHCI,
 	0
 };
 
 static const struct pci_driver pch_usb_xhci __pci_driver = {
 	.ops	 = &usb_xhci_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
 #endif /* !__SIMPLE_DEVICE__ */

src/southbridge/ricoh/rl5c476/rl5c476.c

@@ -204,8 +204,8 @@ static struct device_operations ricoh_rl5c476_ops = {
 
 static const struct pci_driver ricoh_rl5c476_driver __pci_driver = {
 	.ops    = &ricoh_rl5c476_ops,
-	.vendor = PCI_VENDOR_ID_RICOH,
-	.device = PCI_DEVICE_ID_RICOH_RL5C476,
+	.vendor = PCI_VID_RICOH,
+	.device = PCI_DID_RICOH_RL5C476,
 };
 
 static void southbridge_init(struct device *dev)

src/southbridge/ti/pci1x2x/pci1x2x.c

@@ -50,26 +50,26 @@ struct device_operations southbridge_ti_pci1x2x_pciops = {
 
 static const struct pci_driver ti_pci1225_driver __pci_driver = {
 	.ops    = &southbridge_ti_pci1x2x_pciops,
-	.vendor = PCI_VENDOR_ID_TI,
-	.device = PCI_DEVICE_ID_TI_1225,
+	.vendor = PCI_VID_TI,
+	.device = PCI_DID_TI_1225,
 };
 
 static const struct pci_driver ti_pci1420_driver __pci_driver = {
 	.ops    = &southbridge_ti_pci1x2x_pciops,
-	.vendor = PCI_VENDOR_ID_TI,
-	.device = PCI_DEVICE_ID_TI_1420,
+	.vendor = PCI_VID_TI,
+	.device = PCI_DID_TI_1420,
 };
 
 static const struct pci_driver ti_pci1510_driver __pci_driver = {
 	.ops    = &southbridge_ti_pci1x2x_pciops,
-	.vendor = PCI_VENDOR_ID_TI,
-	.device = PCI_DEVICE_ID_TI_1510,
+	.vendor = PCI_VID_TI,
+	.device = PCI_DID_TI_1510,
 };
 
 static const struct pci_driver ti_pci1520_driver __pci_driver = {
 	.ops    = &southbridge_ti_pci1x2x_pciops,
-	.vendor = PCI_VENDOR_ID_TI,
-	.device = PCI_DEVICE_ID_TI_1520,
+	.vendor = PCI_VID_TI,
+	.device = PCI_DID_TI_1520,
 };
 
 struct chip_operations southbridge_ti_pci1x2x_ops = {