diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2014-10-27 03:44:38 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-11-11 23:14:30 +0100 |
| commit | f8338694270224970cbaae7e404517ec39f9c753 (patch) | |
| tree | 2b60a945d17adf6fd2eb83867f716326b9a0f602 /arch | |
| parent | Revert "PCI: Add x86_msi.msi_mask_irq() and msix_mask_irq()" (diff) | |
| download | linux-f8338694270224970cbaae7e404517ec39f9c753.tar.xz linux-f8338694270224970cbaae7e404517ec39f9c753.zip | |
s390/MSI: Use __msi_mask_irq() instead of default_msi_mask_irq()
Now only s390/MSI use default_msi_mask_irq() and default_msix_mask_irq(),
replace them with the common MSI mask IRQ functions __msi_mask_irq() and
__msix_mask_irq(). Remove default_msi_mask_irq() and
default_msix_mask_irq().
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
CC: linux-s390@vger.kernel.org
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 2fa7b14b9c08..552b9908aa77 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -448,9 +448,9 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev) /* Release MSI interrupts */ list_for_each_entry(msi, &pdev->msi_list, list) { if (msi->msi_attrib.is_msix) - default_msix_mask_irq(msi, 1); + __msix_mask_irq(msi, 1); else - default_msi_mask_irq(msi, 1, 1); + __msi_mask_irq(msi, 1, 1); irq_set_msi_desc(msi->irq, NULL); irq_free_desc(msi->irq); msi->msg.address_lo = 0; |