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/amd/common/block/pci/pcie_gpp.c

diff --git a/src/soc/amd/common/block/pci/pcie_gpp.c b/src/soc/amd/common/block/pci/pcie_gpp.c
index d48d49c..2e37935 100644
--- a/src/soc/amd/common/block/pci/pcie_gpp.c
+++ b/src/soc/amd/common/block/pci/pcie_gpp.c
@@ -59,16 +59,16 @@
 };
 
 static const unsigned short internal_pci_gpp_ids[] = {
-	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA,
-	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB,
-	PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC,
-	PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC,
+	PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA,
+	PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB,
+	PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC,
+	PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC,
 	0
 };
 
 static const struct pci_driver internal_pcie_gpp_driver __pci_driver = {
 	.ops			= &internal_pcie_gpp_ops,
-	.vendor			= PCI_VENDOR_ID_AMD,
+	.vendor			= PCI_VID_AMD,
 	.devices		= internal_pci_gpp_ids,
 };
 
@@ -83,15 +83,15 @@
 };
 
 static const unsigned short external_pci_gpp_ids[] = {
-	PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP,
-	PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1,
-	PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2,
-	PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP,
+	PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP,
+	PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1,
+	PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2,
+	PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP,
 	0
 };
 
 static const struct pci_driver external_pcie_gpp_driver __pci_driver = {
 	.ops			= &external_pcie_gpp_ops,
-	.vendor			= PCI_VENDOR_ID_AMD,
+	.vendor			= PCI_VID_AMD,
 	.devices		= external_pci_gpp_ids,
 };