diff options
author | Felix Singer <felixsinger@posteo.net> | 2022-03-07 04:34:52 +0100 |
---|---|---|
committer | Felix Singer <felixsinger@posteo.net> | 2022-03-07 08:32:09 +0000 |
commit | 43b7f416783ccc98952a4eb5f9274907442b03e5 (patch) | |
tree | 86a45336e809bee5d2891f2be9cf00184da9bb18 /src/drivers/intel | |
parent | 2c423441c054d7a8c93cc814b9db5f8f7185bd0f (diff) | |
download | coreboot-43b7f416783ccc98952a4eb5f9274907442b03e5.tar.gz coreboot-43b7f416783ccc98952a4eb5f9274907442b03e5.tar.bz2 coreboot-43b7f416783ccc98952a4eb5f9274907442b03e5.zip |
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>
Diffstat (limited to 'src/drivers/intel')
-rw-r--r-- | src/drivers/intel/gma/opregion.c | 2 | ||||
-rw-r--r-- | src/drivers/intel/i210/i210.c | 2 | ||||
-rw-r--r-- | src/drivers/intel/ish/ish.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/intel/gma/opregion.c b/src/drivers/intel/gma/opregion.c index 430bda35b1d7..ff77f653b008 100644 --- a/src/drivers/intel/gma/opregion.c +++ b/src/drivers/intel/gma/opregion.c @@ -159,7 +159,7 @@ static enum cb_err locate_vbt_vbios(const u8 *vbios, struct region_device *rdev) /* Make sure we got an Intel VGA option rom */ if ((oprom->signature != OPROM_SIGNATURE) || - (pcir->vendor != PCI_VENDOR_ID_INTEL) || + (pcir->vendor != PCI_VID_INTEL) || (pcir->signature != 0x52494350) || (pcir->classcode[0] != 0x00) || (pcir->classcode[1] != 0x00) || diff --git a/src/drivers/intel/i210/i210.c b/src/drivers/intel/i210/i210.c index 32cae6f2691d..0b2fcd250e6a 100644 --- a/src/drivers/intel/i210/i210.c +++ b/src/drivers/intel/i210/i210.c @@ -224,6 +224,6 @@ static const unsigned short i210_device_ids[] = { 0x1537, 0x1538, 0x1533, 0 }; static const struct pci_driver i210_driver __pci_driver = { .ops = &i210_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = i210_device_ids, }; diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c index 9ab4f2d51052..7718ac543f3f 100644 --- a/src/drivers/intel/ish/ish.c +++ b/src/drivers/intel/ish/ish.c @@ -51,16 +51,16 @@ static const struct device_operations pci_ish_device_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_INTEL_CNL_ISHB, - PCI_DEVICE_ID_INTEL_CML_ISHB, - PCI_DEVICE_ID_INTEL_TGL_ISHB, - PCI_DEVICE_ID_INTEL_TGL_H_ISHB, + PCI_DID_INTEL_CNL_ISHB, + PCI_DID_INTEL_CML_ISHB, + PCI_DID_INTEL_TGL_ISHB, + PCI_DID_INTEL_TGL_H_ISHB, 0 }; static const struct pci_driver ish_intel_driver __pci_driver = { .ops = &pci_ish_device_ops, - .vendor = PCI_VENDOR_ID_INTEL, + .vendor = PCI_VID_INTEL, .devices = pci_device_ids, }; |