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/soc/amd/picasso | |
| parent | 2c423441c054d7a8c93cc814b9db5f8f7185bd0f (diff) | |
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/soc/amd/picasso')
| -rw-r--r-- | src/soc/amd/picasso/data_fabric.c | 34 | ||||
| -rw-r--r-- | src/soc/amd/picasso/root_complex.c | 4 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/soc/amd/picasso/data_fabric.c b/src/soc/amd/picasso/data_fabric.c index 75d72e9fe8..50f75bc46a 100644 --- a/src/soc/amd/picasso/data_fabric.c +++ b/src/soc/amd/picasso/data_fabric.c @@ -101,21 +101,21 @@ void data_fabric_set_mmio_np(void) static const char *data_fabric_acpi_name(const struct device *dev) { switch (dev->device) { - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0: + case PCI_DID_AMD_FAM17H_MODEL18H_DF0: return "DFD0"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1: + case PCI_DID_AMD_FAM17H_MODEL18H_DF1: return "DFD1"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2: + case PCI_DID_AMD_FAM17H_MODEL18H_DF2: return "DFD2"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3: + case PCI_DID_AMD_FAM17H_MODEL18H_DF3: return "DFD3"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4: + case PCI_DID_AMD_FAM17H_MODEL18H_DF4: return "DFD4"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5: + case PCI_DID_AMD_FAM17H_MODEL18H_DF5: return "DFD5"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6: + case PCI_DID_AMD_FAM17H_MODEL18H_DF6: return "DFD6"; - case PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7: + case PCI_DID_AMD_FAM17H_MODEL18H_DF7: return "DFD7"; default: printk(BIOS_ERR, "%s: Unhandled device id 0x%x\n", __func__, dev->device); @@ -132,19 +132,19 @@ static struct device_operations data_fabric_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF0, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF2, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF3, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF4, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF5, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF6, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_DF7, + PCI_DID_AMD_FAM17H_MODEL18H_DF0, + PCI_DID_AMD_FAM17H_MODEL18H_DF1, + PCI_DID_AMD_FAM17H_MODEL18H_DF2, + PCI_DID_AMD_FAM17H_MODEL18H_DF3, + PCI_DID_AMD_FAM17H_MODEL18H_DF4, + PCI_DID_AMD_FAM17H_MODEL18H_DF5, + PCI_DID_AMD_FAM17H_MODEL18H_DF6, + PCI_DID_AMD_FAM17H_MODEL18H_DF7, 0 }; static const struct pci_driver data_fabric_driver __pci_driver = { .ops = &data_fabric_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/picasso/root_complex.c b/src/soc/amd/picasso/root_complex.c index d5fd10db9d..73a50a915a 100644 --- a/src/soc/amd/picasso/root_complex.c +++ b/src/soc/amd/picasso/root_complex.c @@ -223,6 +223,6 @@ static struct device_operations root_complex_operations = { static const struct pci_driver family17_root_complex __pci_driver = { .ops = &root_complex_operations, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_17H_MODEL_101F_NB, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_17H_MODEL_101F_NB, }; |