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>
This commit is contained in:
@@ -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) ||
|
||||
|
@@ -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,
|
||||
};
|
||||
|
@@ -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,
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user