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/drivers/genesyslogic/gl9750/gl9750.c | 4 ++-- src/drivers/genesyslogic/gl9755/gl9755.c | 4 ++-- src/drivers/genesyslogic/gl9763e/gl9763e.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/drivers/genesyslogic') diff --git a/src/drivers/genesyslogic/gl9750/gl9750.c b/src/drivers/genesyslogic/gl9750/gl9750.c index ca5cd096a5..c021eadf00 100644 --- a/src/drivers/genesyslogic/gl9750/gl9750.c +++ b/src/drivers/genesyslogic/gl9750/gl9750.c @@ -35,13 +35,13 @@ static struct device_operations gl9750_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_GLI_9750, + PCI_DID_GLI_9750, 0 }; static const struct pci_driver genesyslogic_gl9750 __pci_driver = { .ops = &gl9750_ops, - .vendor = PCI_VENDOR_ID_GLI, + .vendor = PCI_VID_GLI, .devices = pci_device_ids, }; diff --git a/src/drivers/genesyslogic/gl9755/gl9755.c b/src/drivers/genesyslogic/gl9755/gl9755.c index 44342c6632..bf4831c504 100644 --- a/src/drivers/genesyslogic/gl9755/gl9755.c +++ b/src/drivers/genesyslogic/gl9755/gl9755.c @@ -47,13 +47,13 @@ static struct device_operations gl9755_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_GLI_9755, + PCI_DID_GLI_9755, 0 }; static const struct pci_driver genesyslogic_gl9755 __pci_driver = { .ops = &gl9755_ops, - .vendor = PCI_VENDOR_ID_GLI, + .vendor = PCI_VID_GLI, .devices = pci_device_ids, }; diff --git a/src/drivers/genesyslogic/gl9763e/gl9763e.c b/src/drivers/genesyslogic/gl9763e/gl9763e.c index cd581b9380..4dcfbdcbd0 100644 --- a/src/drivers/genesyslogic/gl9763e/gl9763e.c +++ b/src/drivers/genesyslogic/gl9763e/gl9763e.c @@ -50,13 +50,13 @@ static struct device_operations gl9763e_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_GLI_9763E, + PCI_DID_GLI_9763E, 0 }; static const struct pci_driver genesyslogic_gl9763e __pci_driver = { .ops = &gl9763e_ops, - .vendor = PCI_VENDOR_ID_GLI, + .vendor = PCI_VID_GLI, .devices = pci_device_ids, }; -- cgit v1.2.3