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>

1 files changed, 96 insertions, 96 deletions

diff --git a/src/soc/intel/common/block/uart/uart.c b/src/soc/intel/common/block/uart/uart.c
index 2e70d05ba30c..cd960f2ea91f 100644
--- a/src/soc/intel/common/block/uart/uart.c
+++ b/src/soc/intel/common/block/uart/uart.c
@@ -271,34 +271,34 @@ static void uart_fill_ssdt(const struct device *dev)
 static const char *uart_acpi_hid(const struct device *dev)
 {
 	switch (dev->device) {
-	case PCI_DEVICE_ID_INTEL_APL_UART0:
+	case PCI_DID_INTEL_APL_UART0:
 		return "80865abc";
-	case PCI_DEVICE_ID_INTEL_APL_UART1:
+	case PCI_DID_INTEL_APL_UART1:
 		return "80865abe";
-	case PCI_DEVICE_ID_INTEL_APL_UART2:
+	case PCI_DID_INTEL_APL_UART2:
 		return "80865ac0";
-	case PCI_DEVICE_ID_INTEL_GLK_UART0:
+	case PCI_DID_INTEL_GLK_UART0:
 		return  "808631bc";
-	case PCI_DEVICE_ID_INTEL_GLK_UART1:
+	case PCI_DID_INTEL_GLK_UART1:
 		return  "808631be";
-	case PCI_DEVICE_ID_INTEL_GLK_UART2:
+	case PCI_DID_INTEL_GLK_UART2:
 		return  "808631c0";
-	case PCI_DEVICE_ID_INTEL_GLK_UART3:
+	case PCI_DID_INTEL_GLK_UART3:
 		return  "808631ee";
-	case PCI_DEVICE_ID_INTEL_SPT_UART0:
-	case PCI_DEVICE_ID_INTEL_SPT_H_UART0:
+	case PCI_DID_INTEL_SPT_UART0:
+	case PCI_DID_INTEL_SPT_H_UART0:
 		return "INT3448";
-	case PCI_DEVICE_ID_INTEL_SPT_UART1:
-	case PCI_DEVICE_ID_INTEL_SPT_H_UART1:
+	case PCI_DID_INTEL_SPT_UART1:
+	case PCI_DID_INTEL_SPT_H_UART1:
 		return "INT3449";
-	case PCI_DEVICE_ID_INTEL_SPT_UART2:
-	case PCI_DEVICE_ID_INTEL_SPT_H_UART2:
+	case PCI_DID_INTEL_SPT_UART2:
+	case PCI_DID_INTEL_SPT_H_UART2:
 		return "INT344A";
-	case PCI_DEVICE_ID_INTEL_CNP_H_UART0:
+	case PCI_DID_INTEL_CNP_H_UART0:
 		return "INT34B8";
-	case PCI_DEVICE_ID_INTEL_CNP_H_UART1:
+	case PCI_DID_INTEL_CNP_H_UART1:
 		return "INT34B9";
-	case PCI_DEVICE_ID_INTEL_CNP_H_UART2:
+	case PCI_DID_INTEL_CNP_H_UART2:
 		return "INT34BA";
 	default:
 		return NULL;
@@ -308,25 +308,25 @@ static const char *uart_acpi_hid(const struct device *dev)
 static const char *uart_acpi_name(const struct device *dev)
 {
 	switch (dev->device) {
-	case PCI_DEVICE_ID_INTEL_APL_UART0:
-	case PCI_DEVICE_ID_INTEL_GLK_UART0:
-	case PCI_DEVICE_ID_INTEL_SPT_UART0:
-	case PCI_DEVICE_ID_INTEL_SPT_H_UART0:
-	case PCI_DEVICE_ID_INTEL_CNP_H_UART0:
+	case PCI_DID_INTEL_APL_UART0:
+	case PCI_DID_INTEL_GLK_UART0:
+	case PCI_DID_INTEL_SPT_UART0:
+	case PCI_DID_INTEL_SPT_H_UART0:
+	case PCI_DID_INTEL_CNP_H_UART0:
 		return "UAR0";
-	case PCI_DEVICE_ID_INTEL_APL_UART1:
-	case PCI_DEVICE_ID_INTEL_GLK_UART1:
-	case PCI_DEVICE_ID_INTEL_SPT_UART1:
-	case PCI_DEVICE_ID_INTEL_SPT_H_UART1:
-	case PCI_DEVICE_ID_INTEL_CNP_H_UART1:
+	case PCI_DID_INTEL_APL_UART1:
+	case PCI_DID_INTEL_GLK_UART1:
+	case PCI_DID_INTEL_SPT_UART1:
+	case PCI_DID_INTEL_SPT_H_UART1:
+	case PCI_DID_INTEL_CNP_H_UART1:
 		return "UAR1";
-	case PCI_DEVICE_ID_INTEL_APL_UART2:
-	case PCI_DEVICE_ID_INTEL_GLK_UART2:
-	case PCI_DEVICE_ID_INTEL_SPT_UART2:
-	case PCI_DEVICE_ID_INTEL_SPT_H_UART2:
-	case PCI_DEVICE_ID_INTEL_CNP_H_UART2:
+	case PCI_DID_INTEL_APL_UART2:
+	case PCI_DID_INTEL_GLK_UART2:
+	case PCI_DID_INTEL_SPT_UART2:
+	case PCI_DID_INTEL_SPT_H_UART2:
+	case PCI_DID_INTEL_CNP_H_UART2:
 		return "UAR2";
-	case PCI_DEVICE_ID_INTEL_GLK_UART3:
+	case PCI_DID_INTEL_GLK_UART3:
 		return "UAR3";
 	default:
 		return NULL;
@@ -344,75 +344,75 @@ static struct device_operations device_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_SPT_UART0,
-	PCI_DEVICE_ID_INTEL_SPT_UART1,
-	PCI_DEVICE_ID_INTEL_SPT_UART2,
-	PCI_DEVICE_ID_INTEL_SPT_H_UART0,
-	PCI_DEVICE_ID_INTEL_SPT_H_UART1,
-	PCI_DEVICE_ID_INTEL_SPT_H_UART2,
-	PCI_DEVICE_ID_INTEL_UPT_H_UART0,
-	PCI_DEVICE_ID_INTEL_UPT_H_UART1,
-	PCI_DEVICE_ID_INTEL_UPT_H_UART2,
-	PCI_DEVICE_ID_INTEL_APL_UART0,
-	PCI_DEVICE_ID_INTEL_APL_UART1,
-	PCI_DEVICE_ID_INTEL_APL_UART2,
-	PCI_DEVICE_ID_INTEL_APL_UART3,
-	PCI_DEVICE_ID_INTEL_CNL_UART0,
-	PCI_DEVICE_ID_INTEL_CNL_UART1,
-	PCI_DEVICE_ID_INTEL_CNL_UART2,
-	PCI_DEVICE_ID_INTEL_GLK_UART0,
-	PCI_DEVICE_ID_INTEL_GLK_UART1,
-	PCI_DEVICE_ID_INTEL_GLK_UART2,
-	PCI_DEVICE_ID_INTEL_GLK_UART3,
-	PCI_DEVICE_ID_INTEL_CNP_H_UART0,
-	PCI_DEVICE_ID_INTEL_CNP_H_UART1,
-	PCI_DEVICE_ID_INTEL_CNP_H_UART2,
-	PCI_DEVICE_ID_INTEL_ICP_UART0,
-	PCI_DEVICE_ID_INTEL_ICP_UART1,
-	PCI_DEVICE_ID_INTEL_ICP_UART2,
-	PCI_DEVICE_ID_INTEL_CMP_UART0,
-	PCI_DEVICE_ID_INTEL_CMP_UART1,
-	PCI_DEVICE_ID_INTEL_CMP_UART2,
-	PCI_DEVICE_ID_INTEL_CMP_H_UART0,
-	PCI_DEVICE_ID_INTEL_CMP_H_UART1,
-	PCI_DEVICE_ID_INTEL_CMP_H_UART2,
-	PCI_DEVICE_ID_INTEL_TGP_UART0,
-	PCI_DEVICE_ID_INTEL_TGP_UART1,
-	PCI_DEVICE_ID_INTEL_TGP_UART2,
-	PCI_DEVICE_ID_INTEL_TGP_H_UART0,
-	PCI_DEVICE_ID_INTEL_TGP_H_UART1,
-	PCI_DEVICE_ID_INTEL_TGP_H_UART2,
-	PCI_DEVICE_ID_INTEL_TGP_H_UART3,
-	PCI_DEVICE_ID_INTEL_MCC_UART0,
-	PCI_DEVICE_ID_INTEL_MCC_UART1,
-	PCI_DEVICE_ID_INTEL_MCC_UART2,
-	PCI_DEVICE_ID_INTEL_JSP_UART0,
-	PCI_DEVICE_ID_INTEL_JSP_UART1,
-	PCI_DEVICE_ID_INTEL_JSP_UART2,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART0,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART1,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART2,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART3,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART4,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART5,
-	PCI_DEVICE_ID_INTEL_ADP_S_UART6,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART0,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART1,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART2,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART3,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART4,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART5,
-	PCI_DEVICE_ID_INTEL_ADP_P_UART6,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_UART0,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_UART1,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_UART2,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_UART3,
+	PCI_DID_INTEL_SPT_UART0,
+	PCI_DID_INTEL_SPT_UART1,
+	PCI_DID_INTEL_SPT_UART2,
+	PCI_DID_INTEL_SPT_H_UART0,
+	PCI_DID_INTEL_SPT_H_UART1,
+	PCI_DID_INTEL_SPT_H_UART2,
+	PCI_DID_INTEL_UPT_H_UART0,
+	PCI_DID_INTEL_UPT_H_UART1,
+	PCI_DID_INTEL_UPT_H_UART2,
+	PCI_DID_INTEL_APL_UART0,
+	PCI_DID_INTEL_APL_UART1,
+	PCI_DID_INTEL_APL_UART2,
+	PCI_DID_INTEL_APL_UART3,
+	PCI_DID_INTEL_CNL_UART0,
+	PCI_DID_INTEL_CNL_UART1,
+	PCI_DID_INTEL_CNL_UART2,
+	PCI_DID_INTEL_GLK_UART0,
+	PCI_DID_INTEL_GLK_UART1,
+	PCI_DID_INTEL_GLK_UART2,
+	PCI_DID_INTEL_GLK_UART3,
+	PCI_DID_INTEL_CNP_H_UART0,
+	PCI_DID_INTEL_CNP_H_UART1,
+	PCI_DID_INTEL_CNP_H_UART2,
+	PCI_DID_INTEL_ICP_UART0,
+	PCI_DID_INTEL_ICP_UART1,
+	PCI_DID_INTEL_ICP_UART2,
+	PCI_DID_INTEL_CMP_UART0,
+	PCI_DID_INTEL_CMP_UART1,
+	PCI_DID_INTEL_CMP_UART2,
+	PCI_DID_INTEL_CMP_H_UART0,
+	PCI_DID_INTEL_CMP_H_UART1,
+	PCI_DID_INTEL_CMP_H_UART2,
+	PCI_DID_INTEL_TGP_UART0,
+	PCI_DID_INTEL_TGP_UART1,
+	PCI_DID_INTEL_TGP_UART2,
+	PCI_DID_INTEL_TGP_H_UART0,
+	PCI_DID_INTEL_TGP_H_UART1,
+	PCI_DID_INTEL_TGP_H_UART2,
+	PCI_DID_INTEL_TGP_H_UART3,
+	PCI_DID_INTEL_MCC_UART0,
+	PCI_DID_INTEL_MCC_UART1,
+	PCI_DID_INTEL_MCC_UART2,
+	PCI_DID_INTEL_JSP_UART0,
+	PCI_DID_INTEL_JSP_UART1,
+	PCI_DID_INTEL_JSP_UART2,
+	PCI_DID_INTEL_ADP_S_UART0,
+	PCI_DID_INTEL_ADP_S_UART1,
+	PCI_DID_INTEL_ADP_S_UART2,
+	PCI_DID_INTEL_ADP_S_UART3,
+	PCI_DID_INTEL_ADP_S_UART4,
+	PCI_DID_INTEL_ADP_S_UART5,
+	PCI_DID_INTEL_ADP_S_UART6,
+	PCI_DID_INTEL_ADP_P_UART0,
+	PCI_DID_INTEL_ADP_P_UART1,
+	PCI_DID_INTEL_ADP_P_UART2,
+	PCI_DID_INTEL_ADP_P_UART3,
+	PCI_DID_INTEL_ADP_P_UART4,
+	PCI_DID_INTEL_ADP_P_UART5,
+	PCI_DID_INTEL_ADP_P_UART6,
+	PCI_DID_INTEL_ADP_M_N_UART0,
+	PCI_DID_INTEL_ADP_M_N_UART1,
+	PCI_DID_INTEL_ADP_M_N_UART2,
+	PCI_DID_INTEL_ADP_M_N_UART3,
 	0,
 };
 
 static const struct pci_driver pch_uart __pci_driver = {
 	.ops		= &device_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };