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>
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 0a0b515..97884c6 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -135,6 +135,6 @@
static const struct pci_driver pch_azalia __pci_driver = {
.ops = &azalia_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index ae92ca9..b2e6344 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -692,6 +692,6 @@
static const struct pci_driver pch_lpc __pci_driver = {
.ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};
diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index f8f3ceb..66c7dd2 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/me.c
@@ -285,6 +285,6 @@
static const struct pci_driver intel_me __pci_driver = {
.ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.device = 0x1c3a,
};
diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index 24d11b2..2a6caa6 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.c
@@ -285,7 +285,7 @@
static const struct pci_driver intel_me __pci_driver = {
.ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.device = 0x1e3a,
};
diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c
index da8208a..b82f3da 100644
--- a/src/southbridge/intel/bd82x6x/pci.c
+++ b/src/southbridge/intel/bd82x6x/pci.c
@@ -53,6 +53,6 @@
static const struct pci_driver pch_pci __pci_driver = {
.ops = &device_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};
diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c
index 399c73a..a85b2619 100644
--- a/src/southbridge/intel/bd82x6x/pcie.c
+++ b/src/southbridge/intel/bd82x6x/pcie.c
@@ -249,6 +249,6 @@
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,
};
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index 08a254f3..e243c97 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -272,6 +272,6 @@
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,
};
diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 0ae1f4a..3c19075 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -44,6 +44,6 @@
static const struct pci_driver pch_smbus __pci_driver = {
.ops = &smbus_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};
diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c
index 2764861..3661aba 100644
--- a/src/southbridge/intel/bd82x6x/usb_ehci.c
+++ b/src/southbridge/intel/bd82x6x/usb_ehci.c
@@ -103,6 +103,6 @@
static const struct pci_driver pch_usb_ehci __pci_driver = {
.ops = &usb_ehci_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};
diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c
index 8bd0641..5607b16 100644
--- a/src/southbridge/intel/bd82x6x/usb_xhci.c
+++ b/src/southbridge/intel/bd82x6x/usb_xhci.c
@@ -54,6 +54,6 @@
static const struct pci_driver pch_usb_xhci __pci_driver = {
.ops = &usb_xhci_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};