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/common/block | |
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/common/block')
-rw-r--r-- | src/soc/amd/common/block/acp/acp.c | 4 | ||||
-rw-r--r-- | src/soc/amd/common/block/graphics/graphics.c | 14 | ||||
-rw-r--r-- | src/soc/amd/common/block/hda/hda.c | 8 | ||||
-rw-r--r-- | src/soc/amd/common/block/iommu/iommu.c | 12 | ||||
-rw-r--r-- | src/soc/amd/common/block/lpc/lpc.c | 6 | ||||
-rw-r--r-- | src/soc/amd/common/block/pci/pcie_gpp.c | 20 | ||||
-rw-r--r-- | src/soc/amd/common/block/sata/sata.c | 14 | ||||
-rw-r--r-- | src/soc/amd/common/block/smbus/sm.c | 4 |
8 files changed, 41 insertions, 41 deletions
diff --git a/src/soc/amd/common/block/acp/acp.c b/src/soc/amd/common/block/acp/acp.c index b9dfce29ce..cf0e9f8fe2 100644 --- a/src/soc/amd/common/block/acp/acp.c +++ b/src/soc/amd/common/block/acp/acp.c @@ -55,6 +55,6 @@ static struct device_operations acp_ops = { static const struct pci_driver acp_driver __pci_driver = { .ops = &acp_ops, - .vendor = PCI_VENDOR_ID_AMD, - .device = PCI_DEVICE_ID_AMD_FAM17H_ACP, + .vendor = PCI_VID_AMD, + .device = PCI_DID_AMD_FAM17H_ACP, }; diff --git a/src/soc/amd/common/block/graphics/graphics.c b/src/soc/amd/common/block/graphics/graphics.c index 38a422c6b7..d39f60a85c 100644 --- a/src/soc/amd/common/block/graphics/graphics.c +++ b/src/soc/amd/common/block/graphics/graphics.c @@ -181,17 +181,17 @@ static const struct device_operations graphics_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_ATI_FAM17H_MODEL18H_GPU, - PCI_DEVICE_ID_ATI_FAM17H_MODEL60H_GPU, - PCI_DEVICE_ID_ATI_FAM17H_MODEL68H_GPU, - PCI_DEVICE_ID_ATI_FAM17H_MODELA0H_GPU, - PCI_DEVICE_ID_ATI_FAM19H_MODEL51H_GPU_CEZANNE, - PCI_DEVICE_ID_ATI_FAM19H_MODEL51H_GPU_BARCELO, + PCI_DID_ATI_FAM17H_MODEL18H_GPU, + PCI_DID_ATI_FAM17H_MODEL60H_GPU, + PCI_DID_ATI_FAM17H_MODEL68H_GPU, + PCI_DID_ATI_FAM17H_MODELA0H_GPU, + PCI_DID_ATI_FAM19H_MODEL51H_GPU_CEZANNE, + PCI_DID_ATI_FAM19H_MODEL51H_GPU_BARCELO, 0, }; static const struct pci_driver graphics_driver __pci_driver = { .ops = &graphics_ops, - .vendor = PCI_VENDOR_ID_ATI, + .vendor = PCI_VID_ATI, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/hda/hda.c b/src/soc/amd/common/block/hda/hda.c index 104bb9bbb9..e8436ed9ce 100644 --- a/src/soc/amd/common/block/hda/hda.c +++ b/src/soc/amd/common/block/hda/hda.c @@ -9,9 +9,9 @@ #include <device/azalia_device.h> static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_SB900_HDA, - PCI_DEVICE_ID_AMD_CZ_HDA, - PCI_DEVICE_ID_AMD_FAM17H_HDA1, + PCI_DID_AMD_SB900_HDA, + PCI_DID_AMD_CZ_HDA, + PCI_DID_AMD_FAM17H_HDA1, 0 }; @@ -42,6 +42,6 @@ static struct device_operations hda_audio_ops = { static const struct pci_driver hdaaudio_driver __pci_driver = { .ops = CONFIG(AZALIA_PLUGIN_SUPPORT) ? &default_azalia_audio_ops : &hda_audio_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/iommu/iommu.c b/src/soc/amd/common/block/iommu/iommu.c index 9d4f38e8d9..4f20dd4117 100644 --- a/src/soc/amd/common/block/iommu/iommu.c +++ b/src/soc/amd/common/block/iommu/iommu.c @@ -39,16 +39,16 @@ static struct device_operations iommu_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_15H_MODEL_303F_NB_IOMMU, - PCI_DEVICE_ID_AMD_15H_MODEL_707F_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_1020_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_606F_NB_IOMMU, - PCI_DEVICE_ID_AMD_17H_MODEL_A0AF_NB_IOMMU, + PCI_DID_AMD_15H_MODEL_303F_NB_IOMMU, + PCI_DID_AMD_15H_MODEL_707F_NB_IOMMU, + PCI_DID_AMD_17H_MODEL_1020_NB_IOMMU, + PCI_DID_AMD_17H_MODEL_606F_NB_IOMMU, + PCI_DID_AMD_17H_MODEL_A0AF_NB_IOMMU, 0 }; static const struct pci_driver iommu_driver __pci_driver = { .ops = &iommu_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/lpc/lpc.c b/src/soc/amd/common/block/lpc/lpc.c index ebded6b87a..ee8f7e4814 100644 --- a/src/soc/amd/common/block/lpc/lpc.c +++ b/src/soc/amd/common/block/lpc/lpc.c @@ -323,13 +323,13 @@ static struct device_operations lpc_ops = { static const unsigned short pci_device_ids[] = { /* PCI device ID is used on all discrete FCHs and Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_SB900_LPC, + PCI_DID_AMD_SB900_LPC, /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - PCI_DEVICE_ID_AMD_CZ_LPC, + PCI_DID_AMD_CZ_LPC, 0 }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/pci/pcie_gpp.c b/src/soc/amd/common/block/pci/pcie_gpp.c index d48d49ce82..2e37935da4 100644 --- a/src/soc/amd/common/block/pci/pcie_gpp.c +++ b/src/soc/amd/common/block/pci/pcie_gpp.c @@ -59,16 +59,16 @@ static struct device_operations internal_pcie_gpp_ops = { }; static const unsigned short internal_pci_gpp_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA, - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC, + PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSA, + PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP_BUSB, + PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_BUSABC, + PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP_BUSABC, 0 }; static const struct pci_driver internal_pcie_gpp_driver __pci_driver = { .ops = &internal_pcie_gpp_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = internal_pci_gpp_ids, }; @@ -83,15 +83,15 @@ static struct device_operations external_pcie_gpp_ops = { }; static const unsigned short external_pci_gpp_ids[] = { - PCI_DEVICE_ID_AMD_FAM17H_MODEL18H_PCIE_GPP, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1, - PCI_DEVICE_ID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2, - PCI_DEVICE_ID_AMD_FAM17H_MODELA0H_PCIE_GPP, + PCI_DID_AMD_FAM17H_MODEL18H_PCIE_GPP, + PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D1, + PCI_DID_AMD_FAM17H_MODEL60H_PCIE_GPP_D2, + PCI_DID_AMD_FAM17H_MODELA0H_PCIE_GPP, 0 }; static const struct pci_driver external_pcie_gpp_driver __pci_driver = { .ops = &external_pcie_gpp_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = external_pci_gpp_ids, }; diff --git a/src/soc/amd/common/block/sata/sata.c b/src/soc/amd/common/block/sata/sata.c index 9caec89998..19a7d3edd5 100644 --- a/src/soc/amd/common/block/sata/sata.c +++ b/src/soc/amd/common/block/sata/sata.c @@ -22,17 +22,17 @@ static struct device_operations sata_ops = { }; static const unsigned short pci_device_ids[] = { - PCI_DEVICE_ID_AMD_CZ_SATA, - PCI_DEVICE_ID_AMD_CZ_SATA_AHCI, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER0, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_VER1, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER0, - PCI_DEVICE_ID_AMD_FAM17H_SATA_AHCI_RAID_VER1, + PCI_DID_AMD_CZ_SATA, + PCI_DID_AMD_CZ_SATA_AHCI, + PCI_DID_AMD_FAM17H_SATA_AHCI_VER0, + PCI_DID_AMD_FAM17H_SATA_AHCI_VER1, + PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER0, + PCI_DID_AMD_FAM17H_SATA_AHCI_RAID_VER1, 0 }; static const struct pci_driver sata0_driver __pci_driver = { .ops = &sata_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, .devices = pci_device_ids, }; diff --git a/src/soc/amd/common/block/smbus/sm.c b/src/soc/amd/common/block/smbus/sm.c index ae2edc1506..e8b7c0fce6 100644 --- a/src/soc/amd/common/block/smbus/sm.c +++ b/src/soc/amd/common/block/smbus/sm.c @@ -88,7 +88,7 @@ static struct device_operations smbus_ops = { static const struct pci_driver smbus_driver __pci_driver = { .ops = &smbus_ops, - .vendor = PCI_VENDOR_ID_AMD, + .vendor = PCI_VID_AMD, /* PCI device ID is used on all integrated FCHs except Family 16h Models 00h-3Fh */ - .device = PCI_DEVICE_ID_AMD_CZ_SMBUS, + .device = PCI_DID_AMD_CZ_SMBUS, }; |