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, 140 insertions, 140 deletions

diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c
index 6118f9960f..84e800db6f 100644
--- a/src/soc/intel/common/block/graphics/graphics.c
+++ b/src/soc/intel/common/block/graphics/graphics.c
@@ -177,150 +177,150 @@ static const struct device_operations graphics_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_APL_IGD_HD_505,
-	PCI_DEVICE_ID_INTEL_APL_IGD_HD_500,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_1,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_2,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_3,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULX_4,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_1,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_2,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_3,
-	PCI_DEVICE_ID_INTEL_CNL_GT2_ULT_4,
-	PCI_DEVICE_ID_INTEL_GLK_IGD,
-	PCI_DEVICE_ID_INTEL_GLK_IGD_EU12,
-	PCI_DEVICE_ID_INTEL_WHL_GT1_ULT_1,
-	PCI_DEVICE_ID_INTEL_WHL_GT2_ULT_1,
-	PCI_DEVICE_ID_INTEL_KBL_GT1_SULTM,
-	PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_1,
-	PCI_DEVICE_ID_INTEL_KBL_GT1_SHALM_2,
-	PCI_DEVICE_ID_INTEL_KBL_GT1_SSRVM,
-	PCI_DEVICE_ID_INTEL_KBL_GT1F_DT2,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_SULXM,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_SULTM,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_SULTMR,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_SSRVM,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_SWSTM,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_SHALM,
-	PCI_DEVICE_ID_INTEL_KBL_GT2_DT2P2,
-	PCI_DEVICE_ID_INTEL_KBL_GT2F_SULTM,
-	PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_1,
-	PCI_DEVICE_ID_INTEL_KBL_GT3E_SULTM_2,
-	PCI_DEVICE_ID_INTEL_KBL_GT4_SHALM,
-	PCI_DEVICE_ID_INTEL_AML_GT2_ULX,
-	PCI_DEVICE_ID_INTEL_SKL_GT1F_DT2,
-	PCI_DEVICE_ID_INTEL_SKL_GT1_SULTM,
-	PCI_DEVICE_ID_INTEL_SKL_GT2_DT2P1,
-	PCI_DEVICE_ID_INTEL_SKL_GT2_SULXM,
-	PCI_DEVICE_ID_INTEL_SKL_GT2_SULTM,
-	PCI_DEVICE_ID_INTEL_SKL_GT2_SHALM,
-	PCI_DEVICE_ID_INTEL_SKL_GT2_SWKSM,
-	PCI_DEVICE_ID_INTEL_SKL_GT3_SULTM,
-	PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_1,
-	PCI_DEVICE_ID_INTEL_SKL_GT3E_SULTM_2,
-	PCI_DEVICE_ID_INTEL_SKL_GT3FE_SSRVM,
-	PCI_DEVICE_ID_INTEL_SKL_GT4_SHALM,
-	PCI_DEVICE_ID_INTEL_SKL_GT4E_SWSTM,
-	PCI_DEVICE_ID_INTEL_CFL_H_GT2,
-	PCI_DEVICE_ID_INTEL_CFL_H_XEON_GT2,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT1_1,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT1_2,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT2_1,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT2_2,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT2_3,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT2_4,
-	PCI_DEVICE_ID_INTEL_CFL_S_GT2_5,
-	PCI_DEVICE_ID_INTEL_ICL_GT0_ULT,
-	PCI_DEVICE_ID_INTEL_ICL_GT0_5_ULT,
-	PCI_DEVICE_ID_INTEL_ICL_GT1_ULT,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_0,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_1,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_1,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_2,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_2,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_3,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_3,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_4,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_4,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_5,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULT_5,
-	PCI_DEVICE_ID_INTEL_ICL_GT2_ULX_6,
-	PCI_DEVICE_ID_INTEL_ICL_GT3_ULT,
-	PCI_DEVICE_ID_INTEL_CML_GT1_ULT_1,
-	PCI_DEVICE_ID_INTEL_CML_GT1_ULT_2,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULT_1,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULT_2,
-	PCI_DEVICE_ID_INTEL_CML_GT1_ULT_3,
-	PCI_DEVICE_ID_INTEL_CML_GT1_ULT_4,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULT_5,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULT_6,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULT_3,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULT_4,
-	PCI_DEVICE_ID_INTEL_CML_GT1_ULX_1,
-	PCI_DEVICE_ID_INTEL_CML_GT2_ULX_1,
-	PCI_DEVICE_ID_INTEL_CML_GT1_S_1,
-	PCI_DEVICE_ID_INTEL_CML_GT1_S_2,
-	PCI_DEVICE_ID_INTEL_CML_GT2_S_1,
-	PCI_DEVICE_ID_INTEL_CML_GT2_S_2,
-	PCI_DEVICE_ID_INTEL_CML_GT1_H_1,
-	PCI_DEVICE_ID_INTEL_CML_GT1_H_2,
-	PCI_DEVICE_ID_INTEL_CML_GT2_H_1,
-	PCI_DEVICE_ID_INTEL_CML_GT2_H_2,
-	PCI_DEVICE_ID_INTEL_CML_GT2_S_G0,
-	PCI_DEVICE_ID_INTEL_CML_GT2_S_P0,
-	PCI_DEVICE_ID_INTEL_CML_GT2_H_R0,
-	PCI_DEVICE_ID_INTEL_CML_GT2_H_R1,
-	PCI_DEVICE_ID_INTEL_TGL_GT0,
-	PCI_DEVICE_ID_INTEL_TGL_GT1_H_32,
-	PCI_DEVICE_ID_INTEL_TGL_GT1_H_16,
-	PCI_DEVICE_ID_INTEL_TGL_GT2_ULT,
-	PCI_DEVICE_ID_INTEL_TGL_GT2_ULX,
-	PCI_DEVICE_ID_INTEL_TGL_GT3_ULT,
-	PCI_DEVICE_ID_INTEL_TGL_GT2_ULT_1,
-	PCI_DEVICE_ID_INTEL_EHL_GT1_1,
-	PCI_DEVICE_ID_INTEL_EHL_GT2_1,
-	PCI_DEVICE_ID_INTEL_EHL_GT1_2,
-	PCI_DEVICE_ID_INTEL_EHL_GT2_2,
-	PCI_DEVICE_ID_INTEL_EHL_GT1_2_1,
-	PCI_DEVICE_ID_INTEL_EHL_GT1_3,
-	PCI_DEVICE_ID_INTEL_EHL_GT2_3,
-	PCI_DEVICE_ID_INTEL_JSL_GT1,
-	PCI_DEVICE_ID_INTEL_JSL_GT2,
-	PCI_DEVICE_ID_INTEL_JSL_GT3,
-	PCI_DEVICE_ID_INTEL_JSL_GT4,
-	PCI_DEVICE_ID_INTEL_ADL_GT0,
-	PCI_DEVICE_ID_INTEL_ADL_GT1,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_1,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_2,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_3,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_4,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_5,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_6,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_7,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_8,
-	PCI_DEVICE_ID_INTEL_ADL_GT1_9,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_1,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_2,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_3,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_4,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_5,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_6,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_7,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_8,
-	PCI_DEVICE_ID_INTEL_ADL_P_GT2_9,
-	PCI_DEVICE_ID_INTEL_ADL_S_GT1,
-	PCI_DEVICE_ID_INTEL_ADL_M_GT1,
-	PCI_DEVICE_ID_INTEL_ADL_M_GT2,
-	PCI_DEVICE_ID_INTEL_ADL_M_GT3,
-	PCI_DEVICE_ID_INTEL_ADL_N_GT1,
-	PCI_DEVICE_ID_INTEL_ADL_N_GT2,
-	PCI_DEVICE_ID_INTEL_ADL_N_GT3,
+	PCI_DID_INTEL_APL_IGD_HD_505,
+	PCI_DID_INTEL_APL_IGD_HD_500,
+	PCI_DID_INTEL_CNL_GT2_ULX_1,
+	PCI_DID_INTEL_CNL_GT2_ULX_2,
+	PCI_DID_INTEL_CNL_GT2_ULX_3,
+	PCI_DID_INTEL_CNL_GT2_ULX_4,
+	PCI_DID_INTEL_CNL_GT2_ULT_1,
+	PCI_DID_INTEL_CNL_GT2_ULT_2,
+	PCI_DID_INTEL_CNL_GT2_ULT_3,
+	PCI_DID_INTEL_CNL_GT2_ULT_4,
+	PCI_DID_INTEL_GLK_IGD,
+	PCI_DID_INTEL_GLK_IGD_EU12,
+	PCI_DID_INTEL_WHL_GT1_ULT_1,
+	PCI_DID_INTEL_WHL_GT2_ULT_1,
+	PCI_DID_INTEL_KBL_GT1_SULTM,
+	PCI_DID_INTEL_KBL_GT1_SHALM_1,
+	PCI_DID_INTEL_KBL_GT1_SHALM_2,
+	PCI_DID_INTEL_KBL_GT1_SSRVM,
+	PCI_DID_INTEL_KBL_GT1F_DT2,
+	PCI_DID_INTEL_KBL_GT2_SULXM,
+	PCI_DID_INTEL_KBL_GT2_SULTM,
+	PCI_DID_INTEL_KBL_GT2_SULTMR,
+	PCI_DID_INTEL_KBL_GT2_SSRVM,
+	PCI_DID_INTEL_KBL_GT2_SWSTM,
+	PCI_DID_INTEL_KBL_GT2_SHALM,
+	PCI_DID_INTEL_KBL_GT2_DT2P2,
+	PCI_DID_INTEL_KBL_GT2F_SULTM,
+	PCI_DID_INTEL_KBL_GT3E_SULTM_1,
+	PCI_DID_INTEL_KBL_GT3E_SULTM_2,
+	PCI_DID_INTEL_KBL_GT4_SHALM,
+	PCI_DID_INTEL_AML_GT2_ULX,
+	PCI_DID_INTEL_SKL_GT1F_DT2,
+	PCI_DID_INTEL_SKL_GT1_SULTM,
+	PCI_DID_INTEL_SKL_GT2_DT2P1,
+	PCI_DID_INTEL_SKL_GT2_SULXM,
+	PCI_DID_INTEL_SKL_GT2_SULTM,
+	PCI_DID_INTEL_SKL_GT2_SHALM,
+	PCI_DID_INTEL_SKL_GT2_SWKSM,
+	PCI_DID_INTEL_SKL_GT3_SULTM,
+	PCI_DID_INTEL_SKL_GT3E_SULTM_1,
+	PCI_DID_INTEL_SKL_GT3E_SULTM_2,
+	PCI_DID_INTEL_SKL_GT3FE_SSRVM,
+	PCI_DID_INTEL_SKL_GT4_SHALM,
+	PCI_DID_INTEL_SKL_GT4E_SWSTM,
+	PCI_DID_INTEL_CFL_H_GT2,
+	PCI_DID_INTEL_CFL_H_XEON_GT2,
+	PCI_DID_INTEL_CFL_S_GT1_1,
+	PCI_DID_INTEL_CFL_S_GT1_2,
+	PCI_DID_INTEL_CFL_S_GT2_1,
+	PCI_DID_INTEL_CFL_S_GT2_2,
+	PCI_DID_INTEL_CFL_S_GT2_3,
+	PCI_DID_INTEL_CFL_S_GT2_4,
+	PCI_DID_INTEL_CFL_S_GT2_5,
+	PCI_DID_INTEL_ICL_GT0_ULT,
+	PCI_DID_INTEL_ICL_GT0_5_ULT,
+	PCI_DID_INTEL_ICL_GT1_ULT,
+	PCI_DID_INTEL_ICL_GT2_ULX_0,
+	PCI_DID_INTEL_ICL_GT2_ULX_1,
+	PCI_DID_INTEL_ICL_GT2_ULT_1,
+	PCI_DID_INTEL_ICL_GT2_ULX_2,
+	PCI_DID_INTEL_ICL_GT2_ULT_2,
+	PCI_DID_INTEL_ICL_GT2_ULX_3,
+	PCI_DID_INTEL_ICL_GT2_ULT_3,
+	PCI_DID_INTEL_ICL_GT2_ULX_4,
+	PCI_DID_INTEL_ICL_GT2_ULT_4,
+	PCI_DID_INTEL_ICL_GT2_ULX_5,
+	PCI_DID_INTEL_ICL_GT2_ULT_5,
+	PCI_DID_INTEL_ICL_GT2_ULX_6,
+	PCI_DID_INTEL_ICL_GT3_ULT,
+	PCI_DID_INTEL_CML_GT1_ULT_1,
+	PCI_DID_INTEL_CML_GT1_ULT_2,
+	PCI_DID_INTEL_CML_GT2_ULT_1,
+	PCI_DID_INTEL_CML_GT2_ULT_2,
+	PCI_DID_INTEL_CML_GT1_ULT_3,
+	PCI_DID_INTEL_CML_GT1_ULT_4,
+	PCI_DID_INTEL_CML_GT2_ULT_5,
+	PCI_DID_INTEL_CML_GT2_ULT_6,
+	PCI_DID_INTEL_CML_GT2_ULT_3,
+	PCI_DID_INTEL_CML_GT2_ULT_4,
+	PCI_DID_INTEL_CML_GT1_ULX_1,
+	PCI_DID_INTEL_CML_GT2_ULX_1,
+	PCI_DID_INTEL_CML_GT1_S_1,
+	PCI_DID_INTEL_CML_GT1_S_2,
+	PCI_DID_INTEL_CML_GT2_S_1,
+	PCI_DID_INTEL_CML_GT2_S_2,
+	PCI_DID_INTEL_CML_GT1_H_1,
+	PCI_DID_INTEL_CML_GT1_H_2,
+	PCI_DID_INTEL_CML_GT2_H_1,
+	PCI_DID_INTEL_CML_GT2_H_2,
+	PCI_DID_INTEL_CML_GT2_S_G0,
+	PCI_DID_INTEL_CML_GT2_S_P0,
+	PCI_DID_INTEL_CML_GT2_H_R0,
+	PCI_DID_INTEL_CML_GT2_H_R1,
+	PCI_DID_INTEL_TGL_GT0,
+	PCI_DID_INTEL_TGL_GT1_H_32,
+	PCI_DID_INTEL_TGL_GT1_H_16,
+	PCI_DID_INTEL_TGL_GT2_ULT,
+	PCI_DID_INTEL_TGL_GT2_ULX,
+	PCI_DID_INTEL_TGL_GT3_ULT,
+	PCI_DID_INTEL_TGL_GT2_ULT_1,
+	PCI_DID_INTEL_EHL_GT1_1,
+	PCI_DID_INTEL_EHL_GT2_1,
+	PCI_DID_INTEL_EHL_GT1_2,
+	PCI_DID_INTEL_EHL_GT2_2,
+	PCI_DID_INTEL_EHL_GT1_2_1,
+	PCI_DID_INTEL_EHL_GT1_3,
+	PCI_DID_INTEL_EHL_GT2_3,
+	PCI_DID_INTEL_JSL_GT1,
+	PCI_DID_INTEL_JSL_GT2,
+	PCI_DID_INTEL_JSL_GT3,
+	PCI_DID_INTEL_JSL_GT4,
+	PCI_DID_INTEL_ADL_GT0,
+	PCI_DID_INTEL_ADL_GT1,
+	PCI_DID_INTEL_ADL_GT1_1,
+	PCI_DID_INTEL_ADL_GT1_2,
+	PCI_DID_INTEL_ADL_GT1_3,
+	PCI_DID_INTEL_ADL_GT1_4,
+	PCI_DID_INTEL_ADL_GT1_5,
+	PCI_DID_INTEL_ADL_GT1_6,
+	PCI_DID_INTEL_ADL_GT1_7,
+	PCI_DID_INTEL_ADL_GT1_8,
+	PCI_DID_INTEL_ADL_GT1_9,
+	PCI_DID_INTEL_ADL_P_GT2,
+	PCI_DID_INTEL_ADL_P_GT2_1,
+	PCI_DID_INTEL_ADL_P_GT2_2,
+	PCI_DID_INTEL_ADL_P_GT2_3,
+	PCI_DID_INTEL_ADL_P_GT2_4,
+	PCI_DID_INTEL_ADL_P_GT2_5,
+	PCI_DID_INTEL_ADL_P_GT2_6,
+	PCI_DID_INTEL_ADL_P_GT2_7,
+	PCI_DID_INTEL_ADL_P_GT2_8,
+	PCI_DID_INTEL_ADL_P_GT2_9,
+	PCI_DID_INTEL_ADL_S_GT1,
+	PCI_DID_INTEL_ADL_M_GT1,
+	PCI_DID_INTEL_ADL_M_GT2,
+	PCI_DID_INTEL_ADL_M_GT3,
+	PCI_DID_INTEL_ADL_N_GT1,
+	PCI_DID_INTEL_ADL_N_GT2,
+	PCI_DID_INTEL_ADL_N_GT3,
 	0,
 };
 
 static const struct pci_driver graphics_driver __pci_driver = {
 	.ops		= &graphics_ops,
-	.vendor		= PCI_VENDOR_ID_INTEL,
+	.vendor		= PCI_VID_INTEL,
 	.devices	= pci_device_ids,
 };