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

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 2fa7b14b9c08dee648afcdbe7ae75744ba73cb22..552b9908aa77bde8326d23415b46c52407a62a87 100644 (file)
--- 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;

diff --git a/include/linux/msi.h b/include/linux/msi.h
index f6630a53be7009b68369365cbbefac62062a4e23..efad12742e4579fa596e4f836d52061864df4a56 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -64,8 +64,6 @@ void arch_restore_msi_irqs(struct pci_dev *dev);
 
 void default_teardown_msi_irqs(struct pci_dev *dev);
 void default_restore_msi_irqs(struct pci_dev *dev);
-#define default_msi_mask_irq  __msi_mask_irq
-#define default_msix_mask_irq  __msix_mask_irq
 
 struct msi_chip {
        struct module *owner;