lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: Use msix_table_size() directly, drop multi_msix_capable()

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas
2013-04-17 17:44:48 -06:00
parent 909094c62e
commit 527eee292d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pci/msi.c
View File

@@ -26,6 +26,9 @@
static int pci_msi_enable = 1; static int pci_msi_enable = 1;
#define msix_table_size(flags) ((flags & PCI_MSIX_FLAGS_QSIZE) + 1)
/* Arch hooks */ /* Arch hooks */
#ifndef arch_msi_check_device #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); pci_write_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, control);
/* Request & Map MSI-X table region */ /* 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) if (!base)
return -ENOMEM; return -ENOMEM;
@@ -904,7 +907,7 @@ int pci_msix_table_size(struct pci_dev *dev)
return 0; return 0;
pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control); pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control);
return multi_msix_capable(control); return msix_table_size(control);
} }
/** /**

3
drivers/pci/msi.h
View File

@@ -9,7 +9,4 @@
#define msi_mask_reg(base, is64bit) \ #define msi_mask_reg(base, is64bit) \
(base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32)) (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 */ #endif /* MSI_H */