commit 43b7f416783ccc98952a4eb5f9274907442b03e5
author Felix Singer <felixsinger@posteo.net> Mon Mar 07 04:34:52 2022 +0100
committer Felix Singer <felixsinger@posteo.net> Mon Mar 07 08:32:09 2022 +0000
tree 86a45336e809bee5d2891f2be9cf00184da9bb18
parent 2c423441c054d7a8c93cc814b9db5f8f7185bd0f

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/soc/intel/common/block/cse/cse.c

diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c
index 19d7336..b0b2c5a 100644
--- a/src/soc/intel/common/block/cse/cse.c
+++ b/src/soc/intel/common/block/cse/cse.c
@@ -1257,44 +1257,44 @@
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_APL_CSE0,
-	PCI_DEVICE_ID_INTEL_GLK_CSE0,
-	PCI_DEVICE_ID_INTEL_CNL_CSE0,
-	PCI_DEVICE_ID_INTEL_SKL_CSE0,
-	PCI_DEVICE_ID_INTEL_LWB_CSE0,
-	PCI_DEVICE_ID_INTEL_LWB_CSE0_SUPER,
-	PCI_DEVICE_ID_INTEL_CNP_H_CSE0,
-	PCI_DEVICE_ID_INTEL_ICL_CSE0,
-	PCI_DEVICE_ID_INTEL_CMP_CSE0,
-	PCI_DEVICE_ID_INTEL_CMP_H_CSE0,
-	PCI_DEVICE_ID_INTEL_TGL_CSE0,
-	PCI_DEVICE_ID_INTEL_TGL_H_CSE0,
-	PCI_DEVICE_ID_INTEL_MCC_CSE0,
-	PCI_DEVICE_ID_INTEL_MCC_CSE1,
-	PCI_DEVICE_ID_INTEL_MCC_CSE2,
-	PCI_DEVICE_ID_INTEL_MCC_CSE3,
-	PCI_DEVICE_ID_INTEL_JSP_CSE0,
-	PCI_DEVICE_ID_INTEL_JSP_CSE1,
-	PCI_DEVICE_ID_INTEL_JSP_CSE2,
-	PCI_DEVICE_ID_INTEL_JSP_CSE3,
-	PCI_DEVICE_ID_INTEL_ADP_P_CSE0,
-	PCI_DEVICE_ID_INTEL_ADP_P_CSE1,
-	PCI_DEVICE_ID_INTEL_ADP_P_CSE2,
-	PCI_DEVICE_ID_INTEL_ADP_P_CSE3,
-	PCI_DEVICE_ID_INTEL_ADP_S_CSE0,
-	PCI_DEVICE_ID_INTEL_ADP_S_CSE1,
-	PCI_DEVICE_ID_INTEL_ADP_S_CSE2,
-	PCI_DEVICE_ID_INTEL_ADP_S_CSE3,
-	PCI_DEVICE_ID_INTEL_ADP_M_CSE0,
-	PCI_DEVICE_ID_INTEL_ADP_M_CSE1,
-	PCI_DEVICE_ID_INTEL_ADP_M_CSE2,
-	PCI_DEVICE_ID_INTEL_ADP_M_CSE3,
+	PCI_DID_INTEL_APL_CSE0,
+	PCI_DID_INTEL_GLK_CSE0,
+	PCI_DID_INTEL_CNL_CSE0,
+	PCI_DID_INTEL_SKL_CSE0,
+	PCI_DID_INTEL_LWB_CSE0,
+	PCI_DID_INTEL_LWB_CSE0_SUPER,
+	PCI_DID_INTEL_CNP_H_CSE0,
+	PCI_DID_INTEL_ICL_CSE0,
+	PCI_DID_INTEL_CMP_CSE0,
+	PCI_DID_INTEL_CMP_H_CSE0,
+	PCI_DID_INTEL_TGL_CSE0,
+	PCI_DID_INTEL_TGL_H_CSE0,
+	PCI_DID_INTEL_MCC_CSE0,
+	PCI_DID_INTEL_MCC_CSE1,
+	PCI_DID_INTEL_MCC_CSE2,
+	PCI_DID_INTEL_MCC_CSE3,
+	PCI_DID_INTEL_JSP_CSE0,
+	PCI_DID_INTEL_JSP_CSE1,
+	PCI_DID_INTEL_JSP_CSE2,
+	PCI_DID_INTEL_JSP_CSE3,
+	PCI_DID_INTEL_ADP_P_CSE0,
+	PCI_DID_INTEL_ADP_P_CSE1,
+	PCI_DID_INTEL_ADP_P_CSE2,
+	PCI_DID_INTEL_ADP_P_CSE3,
+	PCI_DID_INTEL_ADP_S_CSE0,
+	PCI_DID_INTEL_ADP_S_CSE1,
+	PCI_DID_INTEL_ADP_S_CSE2,
+	PCI_DID_INTEL_ADP_S_CSE3,
+	PCI_DID_INTEL_ADP_M_CSE0,
+	PCI_DID_INTEL_ADP_M_CSE1,
+	PCI_DID_INTEL_ADP_M_CSE2,
+	PCI_DID_INTEL_ADP_M_CSE3,
 	0,
 };
 
 static const struct pci_driver cse_driver __pci_driver = {
 	.ops			= &cse_ops,
-	.vendor			= PCI_VENDOR_ID_INTEL,
+	.vendor			= PCI_VID_INTEL,
 	/* SoC/chipset needs to provide PCI device ID */
 	.devices		= pci_device_ids
 };