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>

8 files changed, 33 insertions, 33 deletions

diff --git a/src/southbridge/intel/i82801ix/azalia.c b/src/southbridge/intel/i82801ix/azalia.c
index 0179415375..fdc951472e 100644
--- a/src/southbridge/intel/i82801ix/azalia.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index 0132ac5b89..9f70d1f8be 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/pci.c b/src/southbridge/intel/i82801ix/pci.c
index da710a3a8d..5a1350361c 100644
--- a/src/southbridge/intel/i82801ix/pci.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c
index a20e7d6dc4..a199dd12a8 100644
--- a/src/southbridge/intel/i82801ix/pcie.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c
index df74123def..260d76a8cb 100644
--- a/src/southbridge/intel/i82801ix/sata.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 1ccd9f5071..17f7b6b0f1 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c
index 173a0e6be4..543b2ffd38 100644
--- a/src/southbridge/intel/i82801ix/thermal.c
+++ b/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,
 };
diff --git a/src/southbridge/intel/i82801ix/usb_ehci.c b/src/southbridge/intel/i82801ix/usb_ehci.c
index 64f23f6690..4e6327a8cd 100644
--- a/src/southbridge/intel/i82801ix/usb_ehci.c
+++ b/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,
 };