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/southbridge/intel/lynxpoint/pcie.c

diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c
index 30773e6..24fab3b 100644
--- a/src/southbridge/intel/lynxpoint/pcie.c
+++ b/src/southbridge/intel/lynxpoint/pcie.c
@@ -38,7 +38,7 @@
 
 static inline int max_root_ports(void)
 {
-	if (pch_is_lp() || pch_silicon_id() == PCI_DEVICE_ID_INTEL_LPT_H81)
+	if (pch_is_lp() || pch_silicon_id() == PCI_DID_INTEL_LPT_H81)
 		return 6;
 
 	return 8;
@@ -749,25 +749,25 @@
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP1,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP2,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP3,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP4,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP5,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP6,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP7,
-	PCI_DEVICE_ID_INTEL_LPT_H_PCIE_RP8,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP1,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP2,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP3,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP4,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP5,
-	PCI_DEVICE_ID_INTEL_LPT_LP_PCIE_RP6,
+	PCI_DID_INTEL_LPT_H_PCIE_RP1,
+	PCI_DID_INTEL_LPT_H_PCIE_RP2,
+	PCI_DID_INTEL_LPT_H_PCIE_RP3,
+	PCI_DID_INTEL_LPT_H_PCIE_RP4,
+	PCI_DID_INTEL_LPT_H_PCIE_RP5,
+	PCI_DID_INTEL_LPT_H_PCIE_RP6,
+	PCI_DID_INTEL_LPT_H_PCIE_RP7,
+	PCI_DID_INTEL_LPT_H_PCIE_RP8,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP1,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP2,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP3,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP4,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP5,
+	PCI_DID_INTEL_LPT_LP_PCIE_RP6,
 	0
 };
 
 static const struct pci_driver pch_pcie __pci_driver = {
 	.ops	 = &device_ops,
-	.vendor	 = PCI_VENDOR_ID_INTEL,
+	.vendor	 = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };