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>

7 files changed, 17 insertions, 17 deletions

diff --git a/src/soc/intel/denverton_ns/csme_ie_kt.c b/src/soc/intel/denverton_ns/csme_ie_kt.c
index ce00627ba2..0510ef2bb4 100644
--- a/src/soc/intel/denverton_ns/csme_ie_kt.c
+++ b/src/soc/intel/denverton_ns/csme_ie_kt.c
@@ -59,13 +59,13 @@ static struct device_operations csme_ie_kt_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_DNV_ME_KT,
-	PCI_DEVICE_ID_INTEL_DNV_IE_KT,
+	PCI_DID_INTEL_DNV_ME_KT,
+	PCI_DID_INTEL_DNV_IE_KT,
 	0
 };
 
 static const struct pci_driver csme_ie_kt __pci_driver = {
 	.ops = &csme_ie_kt_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c
index 50bf49de77..38df89261e 100644
--- a/src/soc/intel/denverton_ns/lpc.c
+++ b/src/soc/intel/denverton_ns/lpc.c
@@ -534,8 +534,8 @@ static struct device_operations device_ops = {
 
 static const struct pci_driver lpc_driver __pci_driver = {
 	.ops = &device_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_DNV_LPC,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_DNV_LPC,
 };
 
 static void finalize_chipset(void *unused)
diff --git a/src/soc/intel/denverton_ns/npk.c b/src/soc/intel/denverton_ns/npk.c
index ea4816ef05..151992376e 100644
--- a/src/soc/intel/denverton_ns/npk.c
+++ b/src/soc/intel/denverton_ns/npk.c
@@ -30,6 +30,6 @@ static struct device_operations pmc_ops = {
 
 static const struct pci_driver pch_pmc __pci_driver = {
 	.ops = &pmc_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_DNV_TRACEHUB,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_DNV_TRACEHUB,
 };
diff --git a/src/soc/intel/denverton_ns/sata.c b/src/soc/intel/denverton_ns/sata.c
index 1f551f8330..3fb5d75c32 100644
--- a/src/soc/intel/denverton_ns/sata.c
+++ b/src/soc/intel/denverton_ns/sata.c
@@ -56,13 +56,13 @@ static struct device_operations sata_ops = {
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_INTEL_DNV_SATA_AHCI_1,
-	PCI_DEVICE_ID_INTEL_DNV_SATA_AHCI_2,
+	PCI_DID_INTEL_DNV_SATA_AHCI_1,
+	PCI_DID_INTEL_DNV_SATA_AHCI_2,
 	0
 };
 
 static const struct pci_driver soc_sata __pci_driver = {
 	.ops = &sata_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = pci_device_ids,
 };
diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c
index 48b48610a3..16b73281b4 100644
--- a/src/soc/intel/denverton_ns/systemagent.c
+++ b/src/soc/intel/denverton_ns/systemagent.c
@@ -333,13 +333,13 @@ static struct device_operations systemagent_ops = {
 
 /* IDs for System Agent device of Intel Denverton SoC */
 static const unsigned short systemagent_ids[] = {
-	PCI_DEVICE_ID_INTEL_DNV_SA,
-	PCI_DEVICE_ID_INTEL_DNVAD_SA,
+	PCI_DID_INTEL_DNV_SA,
+	PCI_DID_INTEL_DNVAD_SA,
 	0
 };
 
 static const struct pci_driver systemagent_driver __pci_driver = {
 	.ops = &systemagent_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
+	.vendor = PCI_VID_INTEL,
 	.devices = systemagent_ids
 };
diff --git a/src/soc/intel/denverton_ns/uart.c b/src/soc/intel/denverton_ns/uart.c
index f9aa64a0cf..b8598cc4ef 100644
--- a/src/soc/intel/denverton_ns/uart.c
+++ b/src/soc/intel/denverton_ns/uart.c
@@ -44,8 +44,8 @@ static struct device_operations uart_ops = {
 
 static const struct pci_driver uart_driver __pci_driver = {
 	.ops = &uart_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_DNV_HSUART
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_DNV_HSUART
 };
 
 static void hide_hsuarts(void)
diff --git a/src/soc/intel/denverton_ns/xhci.c b/src/soc/intel/denverton_ns/xhci.c
index 5e1e4263a4..2760120c2b 100644
--- a/src/soc/intel/denverton_ns/xhci.c
+++ b/src/soc/intel/denverton_ns/xhci.c
@@ -31,6 +31,6 @@ static struct device_operations usb_xhci_ops = {
 
 static const struct pci_driver pch_usb_xhci __pci_driver = {
 	.ops = &usb_xhci_ops,
-	.vendor = PCI_VENDOR_ID_INTEL,
-	.device = PCI_DEVICE_ID_INTEL_DNV_XHCI,
+	.vendor = PCI_VID_INTEL,
+	.device = PCI_DID_INTEL_DNV_XHCI,
 };