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>

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index fb07e05a947b71e4ead9181e40ec08658a8dfdab..06c5f6edb150f918feecd8ee287d8197ffec67fe 100644 (file)
--- 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 d76c7b2c993cabf1a2d7b1847db7f9e7200d4b05..df128309f837050e7c04b033ad15725be445c199 100644 (file)
--- 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 */