From 43b7f416783ccc98952a4eb5f9274907442b03e5 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 7 Mar 2022 04:34:52 +0100 Subject: src: Make PCI ID define names shorter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/39331 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner --- src/southbridge/intel/ibexpeak/azalia.c | 2 +- src/southbridge/intel/ibexpeak/lpc.c | 2 +- src/southbridge/intel/ibexpeak/me.c | 2 +- src/southbridge/intel/ibexpeak/sata.c | 2 +- src/southbridge/intel/ibexpeak/smbus.c | 2 +- src/southbridge/intel/ibexpeak/thermal.c | 2 +- src/southbridge/intel/ibexpeak/usb_ehci.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/southbridge/intel/ibexpeak') diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c index d4e639ac04..ac950c46df 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.c @@ -123,6 +123,6 @@ static const unsigned short pci_device_ids[] = { 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/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index 53fce008f5..1735020b54 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -568,6 +568,6 @@ static const unsigned short pci_device_ids[] = { 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/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c index 74b386169a..15d8402d8b 100644 --- a/src/southbridge/intel/ibexpeak/me.c +++ b/src/southbridge/intel/ibexpeak/me.c @@ -523,6 +523,6 @@ static const unsigned short pci_device_ids[] = { static const struct pci_driver intel_me __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids }; diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c index 4107abbc3e..45520cd0b7 100644 --- a/src/southbridge/intel/ibexpeak/sata.c +++ b/src/southbridge/intel/ibexpeak/sata.c @@ -211,6 +211,6 @@ static const unsigned short pci_device_ids[] = { 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/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c index 66523256b9..de1ad1843c 100644 --- a/src/southbridge/intel/ibexpeak/smbus.c +++ b/src/southbridge/intel/ibexpeak/smbus.c @@ -43,6 +43,6 @@ static const unsigned short pci_device_ids[] = { 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/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c index b96833cb54..216af67d5b 100644 --- a/src/southbridge/intel/ibexpeak/thermal.c +++ b/src/southbridge/intel/ibexpeak/thermal.c @@ -41,6 +41,6 @@ static struct device_operations thermal_ops = { static const struct pci_driver pch_thermal __pci_driver = { .ops = &thermal_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = PCI_DID_INTEL_IBEXPEAK_THERMAL, }; diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c index 3de8c33652..45c5ceca67 100644 --- a/src/southbridge/intel/ibexpeak/usb_ehci.c +++ b/src/southbridge/intel/ibexpeak/usb_ehci.c @@ -86,6 +86,6 @@ static const unsigned short pci_device_ids[] = { 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, }; -- cgit v1.2.3