diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-18 03:44:48 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-23 19:50:30 +0400 |
| commit | 527eee292d2ee69708a20b90049ef49bdeefc882 (patch) | |
| tree | 6f6c95432644c8e9a63b76f24f7720d9f16b367f /drivers/pci | |
| parent | 909094c62e21c71c4fd122642512ad05b75fe019 (diff) | |
| download | linux-527eee292d2ee69708a20b90049ef49bdeefc882.tar.xz | |
PCI: Use msix_table_size() directly, drop multi_msix_capable()
The users of multi_msix_capable() are really interested in the table
size, so just say what we mean.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi.c | 7 | ||||
| -rw-r--r-- | drivers/pci/msi.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index fb07e05a947b..06c5f6edb150 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -26,6 +26,9 @@ static int pci_msi_enable = 1; +#define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) + + /* Arch hooks */ #ifndef arch_msi_check_device @@ -681,7 +684,7 @@ static int msix_capability_init(struct pci_dev *dev, pci_write_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, control); /* Request & Map MSI-X table region */ - base = msix_map_region(dev, multi_msix_capable(control)); + base = msix_map_region(dev, msix_table_size(control)); if (!base) return -ENOMEM; @@ -904,7 +907,7 @@ int pci_msix_table_size(struct pci_dev *dev) return 0; pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); - return multi_msix_capable(control); + return msix_table_size(control); } /** diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h index d76c7b2c993c..df128309f837 100644 --- a/drivers/pci/msi.h +++ b/drivers/pci/msi.h @@ -9,7 +9,4 @@ #define msi_mask_reg(base, is64bit) \ (base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) -#define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1) -#define multi_msix_capable(control) msix_table_size((control)) - #endif /* MSI_H */ |