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>
diff --git a/src/soc/intel/common/block/scs/mmc.c b/src/soc/intel/common/block/scs/mmc.c
index 7f5519a..538f77f 100644
--- a/src/soc/intel/common/block/scs/mmc.c
+++ b/src/soc/intel/common/block/scs/mmc.c
@@ -71,14 +71,14 @@
};
static const unsigned short pci_device_ids[] = {
- PCI_DEVICE_ID_INTEL_CMP_EMMC,
- PCI_DEVICE_ID_INTEL_JSP_EMMC,
- PCI_DEVICE_ID_INTEL_ADP_EMMC,
+ PCI_DID_INTEL_CMP_EMMC,
+ PCI_DID_INTEL_JSP_EMMC,
+ PCI_DID_INTEL_ADP_EMMC,
0
};
static const struct pci_driver pch_sd __pci_driver = {
.ops = &dev_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids,
};
diff --git a/src/soc/intel/common/block/scs/sd.c b/src/soc/intel/common/block/scs/sd.c
index be59a3d..11a4a94 100644
--- a/src/soc/intel/common/block/scs/sd.c
+++ b/src/soc/intel/common/block/scs/sd.c
@@ -49,21 +49,21 @@
};
static const unsigned short pci_device_ids[] = {
- PCI_DEVICE_ID_INTEL_APL_SD,
- PCI_DEVICE_ID_INTEL_CNL_SD,
- PCI_DEVICE_ID_INTEL_GLK_SD,
- PCI_DEVICE_ID_INTEL_SKL_SD,
- PCI_DEVICE_ID_INTEL_CNP_H_SD,
- PCI_DEVICE_ID_INTEL_ICL_SD,
- PCI_DEVICE_ID_INTEL_CMP_SD,
- PCI_DEVICE_ID_INTEL_CMP_H_SD,
- PCI_DEVICE_ID_INTEL_MCC_SD,
- PCI_DEVICE_ID_INTEL_JSP_SD,
+ PCI_DID_INTEL_APL_SD,
+ PCI_DID_INTEL_CNL_SD,
+ PCI_DID_INTEL_GLK_SD,
+ PCI_DID_INTEL_SKL_SD,
+ PCI_DID_INTEL_CNP_H_SD,
+ PCI_DID_INTEL_ICL_SD,
+ PCI_DID_INTEL_CMP_SD,
+ PCI_DID_INTEL_CMP_H_SD,
+ PCI_DID_INTEL_MCC_SD,
+ PCI_DID_INTEL_JSP_SD,
0
};
static const struct pci_driver pch_sd __pci_driver = {
.ops = &dev_ops,
- .vendor = PCI_VENDOR_ID_INTEL,
+ .vendor = PCI_VID_INTEL,
.devices = pci_device_ids
};