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/soc/intel/quark/ehci.c | 2 +- src/soc/intel/quark/gpio_i2c.c | 2 +- src/soc/intel/quark/lpc.c | 2 +- src/soc/intel/quark/northcluster.c | 2 +- src/soc/intel/quark/sd.c | 2 +- src/soc/intel/quark/spi.c | 2 +- src/soc/intel/quark/uart.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/soc/intel/quark') diff --git a/src/soc/intel/quark/ehci.c b/src/soc/intel/quark/ehci.c index e9fb91b0e4..3005610439 100644 --- a/src/soc/intel/quark/ehci.c +++ b/src/soc/intel/quark/ehci.c @@ -114,6 +114,6 @@ static struct device_operations device_ops = { static const struct pci_driver driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = EHCI_DEVID, }; diff --git a/src/soc/intel/quark/gpio_i2c.c b/src/soc/intel/quark/gpio_i2c.c index e128a09fe6..4910f1b8c6 100644 --- a/src/soc/intel/quark/gpio_i2c.c +++ b/src/soc/intel/quark/gpio_i2c.c @@ -24,6 +24,6 @@ static struct device_operations device_ops = { static const struct pci_driver gfx_driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = I2CGPIO_DEVID, }; diff --git a/src/soc/intel/quark/lpc.c b/src/soc/intel/quark/lpc.c index ad97456579..92b7249293 100644 --- a/src/soc/intel/quark/lpc.c +++ b/src/soc/intel/quark/lpc.c @@ -43,6 +43,6 @@ static struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = QUARK_V_LPC_DEVICE_ID_0, }; diff --git a/src/soc/intel/quark/northcluster.c b/src/soc/intel/quark/northcluster.c index fb9597710f..5cb0c812d7 100644 --- a/src/soc/intel/quark/northcluster.c +++ b/src/soc/intel/quark/northcluster.c @@ -63,6 +63,6 @@ static struct device_operations nc_ops = { static const struct pci_driver systemagent_driver __pci_driver = { .ops = &nc_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = QUARK_MC_DEVICE_ID }; diff --git a/src/soc/intel/quark/sd.c b/src/soc/intel/quark/sd.c index b1f6583ce7..2a52ff3da0 100644 --- a/src/soc/intel/quark/sd.c +++ b/src/soc/intel/quark/sd.c @@ -30,6 +30,6 @@ static const struct device_operations device_ops = { static const struct pci_driver pmc __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = 0x08A7, }; diff --git a/src/soc/intel/quark/spi.c b/src/soc/intel/quark/spi.c index d7e35cdb34..cc284f33a7 100644 --- a/src/soc/intel/quark/spi.c +++ b/src/soc/intel/quark/spi.c @@ -224,7 +224,7 @@ void spi_init(void) /* Determine the base address of the SPI flash controller */ context = &spi_driver_context; - dev = dev_find_device(PCI_VENDOR_ID_INTEL, LPC_DEVID, NULL); + dev = dev_find_device(PCI_VID_INTEL, LPC_DEVID, NULL); rcba = pci_read_config32(dev, R_QNC_LPC_RCBA); if (!(rcba & B_QNC_LPC_RCBA_EN)) { printk(BIOS_ERR, "RBCA not enabled\n"); diff --git a/src/soc/intel/quark/uart.c b/src/soc/intel/quark/uart.c index cf363b1ac7..c045c34a71 100644 --- a/src/soc/intel/quark/uart.c +++ b/src/soc/intel/quark/uart.c @@ -28,6 +28,6 @@ static struct device_operations device_ops = { static const struct pci_driver uart_driver __pci_driver = { .ops = &device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .device = HSUART_DEVID, }; -- cgit v1.2.3