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/drivers/net/r8168.c

diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index 3432249..b4ef40e 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -267,7 +267,7 @@
 	if (!config)
 		return;
 
-	if (dev->device == PCI_DEVICE_ID_REALTEK_8125) {
+	if (dev->device == PCI_DID_REALTEK_8125) {
 		/* Set LED global Feature register */
 		outb(config->led_feature, io_base + CMD_LED_FEATURE);
 		printk(BIOS_DEBUG, "r8125: read back LED global feature setting as 0x%x\n",
@@ -425,14 +425,14 @@
 };
 
 static const unsigned short pci_device_ids[] = {
-	PCI_DEVICE_ID_REALTEK_8168,
-	PCI_DEVICE_ID_REALTEK_8125,
+	PCI_DID_REALTEK_8168,
+	PCI_DID_REALTEK_8125,
 	0
 };
 
 static const struct pci_driver r8168_driver __pci_driver = {
 	.ops    = &r8168_ops,
-	.vendor = PCI_VENDOR_ID_REALTEK,
+	.vendor = PCI_VID_REALTEK,
 	.devices = pci_device_ids,
 };