diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-18 01:58:47 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-23 17:50:30 +0200 |
| commit | 78b5a310ce0ff22889e1a1af932e5c17b26962ba (patch) | |
| tree | c50d2512660eac0a584cb57ec88b95d379489e3b /drivers/pci/msi.c | |
| parent | PCI: Use msix_table_size() directly, drop multi_msix_capable() (diff) | |
| download | linux-78b5a310ce0ff22889e1a1af932e5c17b26962ba.tar.xz linux-78b5a310ce0ff22889e1a1af932e5c17b26962ba.zip | |
PCI: Drop msi_mask_reg() and remove drivers/pci/msi.h
msi_mask_reg() doesn't provide any useful abstraction, do drop it.
Remove the now-empty drivers/pci/msi.h.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/msi.c')
| -rw-r--r-- | drivers/pci/msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 06c5f6edb150..afdc388b9553 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -22,7 +22,6 @@ #include <linux/slab.h> #include "pci.h" -#include "msi.h" static int pci_msi_enable = 1; @@ -564,7 +563,8 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) entry->msi_attrib.default_irq = dev->irq; /* Save IOAPIC IRQ */ entry->msi_attrib.pos = dev->msi_cap; - entry->mask_pos = msi_mask_reg(dev->msi_cap, entry->msi_attrib.is_64); + entry->mask_pos = dev->msi_cap + (control & PCI_MSI_FLAGS_64BIT) ? + PCI_MSI_MASK_64 : PCI_MSI_MASK_32; /* All MSIs are unmasked by default, Mask them all */ if (entry->msi_attrib.maskbit) pci_read_config_dword(dev, entry->mask_pos, &entry->masked); |