diff options
author | Alex Williamson <alex.williamson@redhat.com> | 2013-12-17 18:43:57 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-12-17 19:49:39 -0500 |
commit | 274127a1fdbad3c0d64e813521f4a0ef96cfc70e (patch) | |
tree | 72c5702de4cfcb7337550f355af46f568c448022 /drivers/vfio | |
parent | 425c1b223dac456d00a61fd6b451b6d1cf00d065 (diff) |
PCI: Rename PCI_VC_PORT_REG1/2 to PCI_VC_PORT_CAP1/2
These are set of two capability registers, it's pretty much given that
they're registers, so reflect their purpose in the name.
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r-- | drivers/vfio/pci/vfio_pci_config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c index ffd0632c3cbc..83cd1574c810 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c | |||
@@ -975,20 +975,20 @@ static int vfio_vc_cap_len(struct vfio_pci_device *vdev, u16 pos) | |||
975 | int ret, evcc, phases, vc_arb; | 975 | int ret, evcc, phases, vc_arb; |
976 | int len = PCI_CAP_VC_BASE_SIZEOF; | 976 | int len = PCI_CAP_VC_BASE_SIZEOF; |
977 | 977 | ||
978 | ret = pci_read_config_dword(pdev, pos + PCI_VC_PORT_REG1, &tmp); | 978 | ret = pci_read_config_dword(pdev, pos + PCI_VC_PORT_CAP1, &tmp); |
979 | if (ret) | 979 | if (ret) |
980 | return pcibios_err_to_errno(ret); | 980 | return pcibios_err_to_errno(ret); |
981 | 981 | ||
982 | evcc = tmp & PCI_VC_REG1_EVCC; /* extended vc count */ | 982 | evcc = tmp & PCI_VC_CAP1_EVCC; /* extended vc count */ |
983 | ret = pci_read_config_dword(pdev, pos + PCI_VC_PORT_REG2, &tmp); | 983 | ret = pci_read_config_dword(pdev, pos + PCI_VC_PORT_CAP2, &tmp); |
984 | if (ret) | 984 | if (ret) |
985 | return pcibios_err_to_errno(ret); | 985 | return pcibios_err_to_errno(ret); |
986 | 986 | ||
987 | if (tmp & PCI_VC_REG2_128_PHASE) | 987 | if (tmp & PCI_VC_CAP2_128_PHASE) |
988 | phases = 128; | 988 | phases = 128; |
989 | else if (tmp & PCI_VC_REG2_64_PHASE) | 989 | else if (tmp & PCI_VC_CAP2_64_PHASE) |
990 | phases = 64; | 990 | phases = 64; |
991 | else if (tmp & PCI_VC_REG2_32_PHASE) | 991 | else if (tmp & PCI_VC_CAP2_32_PHASE) |
992 | phases = 32; | 992 | phases = 32; |
993 | else | 993 | else |
994 | phases = 0; | 994 | phases = 0; |