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

diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c
index 08c1bbb1fe..fa937f4fd5 100644
--- a/src/soc/intel/common/block/sata/sata.c
+++ b/src/soc/intel/common/block/sata/sata.c
@@ -13,62 +13,62 @@ static struct device_operations sata_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_SPT_U_SATA,
-	PCI_DEVICE_ID_INTEL_SPT_U_Y_PREMIUM_SATA,
-	PCI_DEVICE_ID_INTEL_SPT_KBL_SATA,
-	PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI,
-	PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI,
-	PCI_DEVICE_ID_INTEL_LWB_SATA_RAID,
-	PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID,
-	PCI_DEVICE_ID_INTEL_LWB_SATA_AHCI_SUPER,
-	PCI_DEVICE_ID_INTEL_LWB_SSATA_AHCI_SUPER,
-	PCI_DEVICE_ID_INTEL_LWB_SATA_RAID_SUPER,
-	PCI_DEVICE_ID_INTEL_LWB_SSATA_RAID_SUPER,
-	PCI_DEVICE_ID_INTEL_LWB_SATA_ALT,
-	PCI_DEVICE_ID_INTEL_LWB_SATA_ALT_RST,
-	PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT,
-	PCI_DEVICE_ID_INTEL_LWB_SSATA_ALT_RST,
-	PCI_DEVICE_ID_INTEL_CNL_SATA,
-	PCI_DEVICE_ID_INTEL_CNL_PREMIUM_SATA,
-	PCI_DEVICE_ID_INTEL_CNP_CMP_COMPAT_SATA,
-	PCI_DEVICE_ID_INTEL_CNP_H_SATA,
-	PCI_DEVICE_ID_INTEL_CNP_H_HALO_SATA,
-	PCI_DEVICE_ID_INTEL_CNP_LP_SATA,
-	PCI_DEVICE_ID_INTEL_ICP_U_SATA,
-	PCI_DEVICE_ID_INTEL_CMP_SATA,
-	PCI_DEVICE_ID_INTEL_CMP_PREMIUM_SATA,
-	PCI_DEVICE_ID_INTEL_CMP_LP_SATA,
-	PCI_DEVICE_ID_INTEL_CMP_H_SATA,
-	PCI_DEVICE_ID_INTEL_CMP_H_HALO_SATA,
-	PCI_DEVICE_ID_INTEL_CMP_H_PREMIUM_SATA,
-	PCI_DEVICE_ID_INTEL_TGP_LP_SATA,
-	PCI_DEVICE_ID_INTEL_TGP_SATA,
-	PCI_DEVICE_ID_INTEL_TGP_PREMIUM_SATA,
-	PCI_DEVICE_ID_INTEL_TGP_COMPAT_SATA,
-	PCI_DEVICE_ID_INTEL_TGP_H_SATA,
-	PCI_DEVICE_ID_INTEL_MCC_AHCI_SATA,
-	PCI_DEVICE_ID_INTEL_JSP_SATA_1,
-	PCI_DEVICE_ID_INTEL_JSP_SATA_2,
-	PCI_DEVICE_ID_INTEL_ADP_P_SATA_1,
-	PCI_DEVICE_ID_INTEL_ADP_P_SATA_2,
-	PCI_DEVICE_ID_INTEL_ADP_P_SATA_3,
-	PCI_DEVICE_ID_INTEL_ADP_P_SATA_4,
-	PCI_DEVICE_ID_INTEL_ADP_P_SATA_5,
-	PCI_DEVICE_ID_INTEL_ADP_P_SATA_6,
-	PCI_DEVICE_ID_INTEL_ADP_S_SATA_1,
-	PCI_DEVICE_ID_INTEL_ADP_S_SATA_2,
-	PCI_DEVICE_ID_INTEL_ADP_S_SATA_3,
-	PCI_DEVICE_ID_INTEL_ADP_S_SATA_4,
-	PCI_DEVICE_ID_INTEL_ADP_S_SATA_5,
-	PCI_DEVICE_ID_INTEL_ADP_S_SATA_6,
-	PCI_DEVICE_ID_INTEL_ADP_M_SATA_1,
-	PCI_DEVICE_ID_INTEL_ADP_M_SATA_2,
-	PCI_DEVICE_ID_INTEL_ADP_M_SATA_3,
+	PCI_DID_INTEL_SPT_U_SATA,
+	PCI_DID_INTEL_SPT_U_Y_PREMIUM_SATA,
+	PCI_DID_INTEL_SPT_KBL_SATA,
+	PCI_DID_INTEL_LWB_SATA_AHCI,
+	PCI_DID_INTEL_LWB_SSATA_AHCI,
+	PCI_DID_INTEL_LWB_SATA_RAID,
+	PCI_DID_INTEL_LWB_SSATA_RAID,
+	PCI_DID_INTEL_LWB_SATA_AHCI_SUPER,
+	PCI_DID_INTEL_LWB_SSATA_AHCI_SUPER,
+	PCI_DID_INTEL_LWB_SATA_RAID_SUPER,
+	PCI_DID_INTEL_LWB_SSATA_RAID_SUPER,
+	PCI_DID_INTEL_LWB_SATA_ALT,
+	PCI_DID_INTEL_LWB_SATA_ALT_RST,
+	PCI_DID_INTEL_LWB_SSATA_ALT,
+	PCI_DID_INTEL_LWB_SSATA_ALT_RST,
+	PCI_DID_INTEL_CNL_SATA,
+	PCI_DID_INTEL_CNL_PREMIUM_SATA,
+	PCI_DID_INTEL_CNP_CMP_COMPAT_SATA,
+	PCI_DID_INTEL_CNP_H_SATA,
+	PCI_DID_INTEL_CNP_H_HALO_SATA,
+	PCI_DID_INTEL_CNP_LP_SATA,
+	PCI_DID_INTEL_ICP_U_SATA,
+	PCI_DID_INTEL_CMP_SATA,
+	PCI_DID_INTEL_CMP_PREMIUM_SATA,
+	PCI_DID_INTEL_CMP_LP_SATA,
+	PCI_DID_INTEL_CMP_H_SATA,
+	PCI_DID_INTEL_CMP_H_HALO_SATA,
+	PCI_DID_INTEL_CMP_H_PREMIUM_SATA,
+	PCI_DID_INTEL_TGP_LP_SATA,
+	PCI_DID_INTEL_TGP_SATA,
+	PCI_DID_INTEL_TGP_PREMIUM_SATA,
+	PCI_DID_INTEL_TGP_COMPAT_SATA,
+	PCI_DID_INTEL_TGP_H_SATA,
+	PCI_DID_INTEL_MCC_AHCI_SATA,
+	PCI_DID_INTEL_JSP_SATA_1,
+	PCI_DID_INTEL_JSP_SATA_2,
+	PCI_DID_INTEL_ADP_P_SATA_1,
+	PCI_DID_INTEL_ADP_P_SATA_2,
+	PCI_DID_INTEL_ADP_P_SATA_3,
+	PCI_DID_INTEL_ADP_P_SATA_4,
+	PCI_DID_INTEL_ADP_P_SATA_5,
+	PCI_DID_INTEL_ADP_P_SATA_6,
+	PCI_DID_INTEL_ADP_S_SATA_1,
+	PCI_DID_INTEL_ADP_S_SATA_2,
+	PCI_DID_INTEL_ADP_S_SATA_3,
+	PCI_DID_INTEL_ADP_S_SATA_4,
+	PCI_DID_INTEL_ADP_S_SATA_5,
+	PCI_DID_INTEL_ADP_S_SATA_6,
+	PCI_DID_INTEL_ADP_M_SATA_1,
+	PCI_DID_INTEL_ADP_M_SATA_2,
+	PCI_DID_INTEL_ADP_M_SATA_3,
 	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,
 };