diff options
| author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2008-05-19 13:48:17 +0900 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-10 10:59:49 -0700 |
| commit | 5ca5c02f0e81c094c19d30dc0d13be4e929a994a (patch) | |
| tree | b014b51148dc378ce15c0daf81c19f03139dc01c /drivers/pci | |
| parent | cf35e4ad57b4c39a4c74921e20e48ec0dbeb14f4 (diff) | |
| download | linux-stable-5ca5c02f0e81c094c19d30dc0d13be4e929a994a.tar.gz linux-stable-5ca5c02f0e81c094c19d30dc0d13be4e929a994a.tar.bz2 linux-stable-5ca5c02f0e81c094c19d30dc0d13be4e929a994a.zip | |
PCI/MSI: skip calling pci_find_capability from msi_set_mask_bits
The position of MSI capability is already cached in the msi_desc when
we enter the msi_set_mask_bits(). Use it instead.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 8c61304cbb37..ccb1974464fb 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -70,12 +70,10 @@ arch_teardown_msi_irqs(struct pci_dev *dev) } } -static void msi_set_enable(struct pci_dev *dev, int enable) +static void __msi_set_enable(struct pci_dev *dev, int pos, int enable) { - int pos; u16 control; - pos = pci_find_capability(dev, PCI_CAP_ID_MSI); if (pos) { pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &control); control &= ~PCI_MSI_FLAGS_ENABLE; @@ -85,6 +83,11 @@ static void msi_set_enable(struct pci_dev *dev, int enable) } } +static void msi_set_enable(struct pci_dev *dev, int enable) +{ + __msi_set_enable(dev, pci_find_capability(dev, PCI_CAP_ID_MSI), enable); +} + static void msix_set_enable(struct pci_dev *dev, int enable) { int pos; @@ -141,7 +144,8 @@ static void msi_set_mask_bits(unsigned int irq, u32 mask, u32 flag) mask_bits |= flag & mask; pci_write_config_dword(entry->dev, pos, mask_bits); } else { - msi_set_enable(entry->dev, !flag); + __msi_set_enable(entry->dev, entry->msi_attrib.pos, + !flag); } break; case PCI_CAP_ID_MSIX: |