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

diff --git a/src/soc/intel/common/block/spi/spi.c b/src/soc/intel/common/block/spi/spi.c
index 33d62c1975..914809951c 100644
--- a/src/soc/intel/common/block/spi/spi.c
+++ b/src/soc/intel/common/block/spi/spi.c
@@ -39,85 +39,85 @@ static struct device_operations spi_dev_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_SPT_SPI1,
-	PCI_DEVICE_ID_INTEL_SPT_SPI2,
-	PCI_DEVICE_ID_INTEL_SPT_SPI3,
-	PCI_DEVICE_ID_INTEL_APL_SPI0,
-	PCI_DEVICE_ID_INTEL_APL_SPI1,
-	PCI_DEVICE_ID_INTEL_APL_SPI2,
-	PCI_DEVICE_ID_INTEL_APL_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_GLK_SPI0,
-	PCI_DEVICE_ID_INTEL_GLK_SPI1,
-	PCI_DEVICE_ID_INTEL_GLK_SPI2,
-	PCI_DEVICE_ID_INTEL_CNL_SPI0,
-	PCI_DEVICE_ID_INTEL_CNL_SPI1,
-	PCI_DEVICE_ID_INTEL_CNL_SPI2,
-	PCI_DEVICE_ID_INTEL_CNL_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_CNP_H_SPI0,
-	PCI_DEVICE_ID_INTEL_CNP_H_SPI1,
-	PCI_DEVICE_ID_INTEL_CNP_H_SPI2,
-	PCI_DEVICE_ID_INTEL_CNP_H_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_LWB_SPI,
-	PCI_DEVICE_ID_INTEL_LWB_SPI_SUPER,
-	PCI_DEVICE_ID_INTEL_ICP_SPI0,
-	PCI_DEVICE_ID_INTEL_ICP_SPI1,
-	PCI_DEVICE_ID_INTEL_ICP_SPI2,
-	PCI_DEVICE_ID_INTEL_ICP_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_CMP_SPI0,
-	PCI_DEVICE_ID_INTEL_CMP_SPI1,
-	PCI_DEVICE_ID_INTEL_CMP_SPI2,
-	PCI_DEVICE_ID_INTEL_CMP_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_CMP_H_SPI0,
-	PCI_DEVICE_ID_INTEL_CMP_H_SPI1,
-	PCI_DEVICE_ID_INTEL_CMP_H_SPI2,
-	PCI_DEVICE_ID_INTEL_CMP_H_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_TGP_SPI0,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI0,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI1,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI2,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI3,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI4,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI5,
-	PCI_DEVICE_ID_INTEL_TGP_GSPI6,
-	PCI_DEVICE_ID_INTEL_TGP_H_SPI0,
-	PCI_DEVICE_ID_INTEL_TGP_H_GSPI0,
-	PCI_DEVICE_ID_INTEL_TGP_H_GSPI1,
-	PCI_DEVICE_ID_INTEL_TGP_H_GSPI2,
-	PCI_DEVICE_ID_INTEL_TGP_H_GSPI3,
-	PCI_DEVICE_ID_INTEL_MCC_SPI0,
-	PCI_DEVICE_ID_INTEL_MCC_GSPI0,
-	PCI_DEVICE_ID_INTEL_MCC_GSPI1,
-	PCI_DEVICE_ID_INTEL_MCC_GSPI2,
-	PCI_DEVICE_ID_INTEL_JSP_SPI0,
-	PCI_DEVICE_ID_INTEL_JSP_SPI1,
-	PCI_DEVICE_ID_INTEL_JSP_SPI2,
-	PCI_DEVICE_ID_INTEL_JSP_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_ADP_P_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_ADP_S_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_HWSEQ_SPI,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI0,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI1,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI2,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI3,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI4,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI5,
-	PCI_DEVICE_ID_INTEL_ADP_P_SPI6,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI0,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI1,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI2,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI3,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI4,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI5,
-	PCI_DEVICE_ID_INTEL_ADP_S_SPI6,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_SPI0,
-	PCI_DEVICE_ID_INTEL_ADP_M_N_SPI1,
-	PCI_DEVICE_ID_INTEL_ADP_M_SPI2,
-	PCI_DEVICE_ID_INTEL_SPR_HWSEQ_SPI,
+	PCI_DID_INTEL_SPT_SPI1,
+	PCI_DID_INTEL_SPT_SPI2,
+	PCI_DID_INTEL_SPT_SPI3,
+	PCI_DID_INTEL_APL_SPI0,
+	PCI_DID_INTEL_APL_SPI1,
+	PCI_DID_INTEL_APL_SPI2,
+	PCI_DID_INTEL_APL_HWSEQ_SPI,
+	PCI_DID_INTEL_GLK_SPI0,
+	PCI_DID_INTEL_GLK_SPI1,
+	PCI_DID_INTEL_GLK_SPI2,
+	PCI_DID_INTEL_CNL_SPI0,
+	PCI_DID_INTEL_CNL_SPI1,
+	PCI_DID_INTEL_CNL_SPI2,
+	PCI_DID_INTEL_CNL_HWSEQ_SPI,
+	PCI_DID_INTEL_CNP_H_SPI0,
+	PCI_DID_INTEL_CNP_H_SPI1,
+	PCI_DID_INTEL_CNP_H_SPI2,
+	PCI_DID_INTEL_CNP_H_HWSEQ_SPI,
+	PCI_DID_INTEL_LWB_SPI,
+	PCI_DID_INTEL_LWB_SPI_SUPER,
+	PCI_DID_INTEL_ICP_SPI0,
+	PCI_DID_INTEL_ICP_SPI1,
+	PCI_DID_INTEL_ICP_SPI2,
+	PCI_DID_INTEL_ICP_HWSEQ_SPI,
+	PCI_DID_INTEL_CMP_SPI0,
+	PCI_DID_INTEL_CMP_SPI1,
+	PCI_DID_INTEL_CMP_SPI2,
+	PCI_DID_INTEL_CMP_HWSEQ_SPI,
+	PCI_DID_INTEL_CMP_H_SPI0,
+	PCI_DID_INTEL_CMP_H_SPI1,
+	PCI_DID_INTEL_CMP_H_SPI2,
+	PCI_DID_INTEL_CMP_H_HWSEQ_SPI,
+	PCI_DID_INTEL_TGP_SPI0,
+	PCI_DID_INTEL_TGP_GSPI0,
+	PCI_DID_INTEL_TGP_GSPI1,
+	PCI_DID_INTEL_TGP_GSPI2,
+	PCI_DID_INTEL_TGP_GSPI3,
+	PCI_DID_INTEL_TGP_GSPI4,
+	PCI_DID_INTEL_TGP_GSPI5,
+	PCI_DID_INTEL_TGP_GSPI6,
+	PCI_DID_INTEL_TGP_H_SPI0,
+	PCI_DID_INTEL_TGP_H_GSPI0,
+	PCI_DID_INTEL_TGP_H_GSPI1,
+	PCI_DID_INTEL_TGP_H_GSPI2,
+	PCI_DID_INTEL_TGP_H_GSPI3,
+	PCI_DID_INTEL_MCC_SPI0,
+	PCI_DID_INTEL_MCC_GSPI0,
+	PCI_DID_INTEL_MCC_GSPI1,
+	PCI_DID_INTEL_MCC_GSPI2,
+	PCI_DID_INTEL_JSP_SPI0,
+	PCI_DID_INTEL_JSP_SPI1,
+	PCI_DID_INTEL_JSP_SPI2,
+	PCI_DID_INTEL_JSP_HWSEQ_SPI,
+	PCI_DID_INTEL_ADP_P_HWSEQ_SPI,
+	PCI_DID_INTEL_ADP_S_HWSEQ_SPI,
+	PCI_DID_INTEL_ADP_M_N_HWSEQ_SPI,
+	PCI_DID_INTEL_ADP_P_SPI0,
+	PCI_DID_INTEL_ADP_P_SPI1,
+	PCI_DID_INTEL_ADP_P_SPI2,
+	PCI_DID_INTEL_ADP_P_SPI3,
+	PCI_DID_INTEL_ADP_P_SPI4,
+	PCI_DID_INTEL_ADP_P_SPI5,
+	PCI_DID_INTEL_ADP_P_SPI6,
+	PCI_DID_INTEL_ADP_S_SPI0,
+	PCI_DID_INTEL_ADP_S_SPI1,
+	PCI_DID_INTEL_ADP_S_SPI2,
+	PCI_DID_INTEL_ADP_S_SPI3,
+	PCI_DID_INTEL_ADP_S_SPI4,
+	PCI_DID_INTEL_ADP_S_SPI5,
+	PCI_DID_INTEL_ADP_S_SPI6,
+	PCI_DID_INTEL_ADP_M_N_SPI0,
+	PCI_DID_INTEL_ADP_M_N_SPI1,
+	PCI_DID_INTEL_ADP_M_SPI2,
+	PCI_DID_INTEL_SPR_HWSEQ_SPI,
 	0
 };
 
 static const struct pci_driver pch_spi __pci_driver = {
 	.ops				= &spi_dev_ops,
-	.vendor				= PCI_VENDOR_ID_INTEL,
+	.vendor				= PCI_VID_INTEL,
 	.devices			= pci_device_ids,
 };