Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[cascardo/linux.git] / arch / s390 / pci / pci.c

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 2fa7b14..d59c825 100644 (file)
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(zpci_list_lock);
 
 static struct irq_chip zpci_irq_chip = {
        .name = "zPCI",
-       .irq_unmask = unmask_msi_irq,
-       .irq_mask = mask_msi_irq,
+       .irq_unmask = pci_msi_unmask_irq,
+       .irq_mask = pci_msi_mask_irq,
 };
 
 static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);
@@ -403,7 +403,7 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                msg.data = hwirq;
                msg.address_lo = zdev->msi_addr & 0xffffffff;
                msg.address_hi = zdev->msi_addr >> 32;
-               write_msi_msg(irq, &msg);
+               pci_write_msi_msg(irq, &msg);
                airq_iv_set_data(zdev->aibv, hwirq, irq);
                hwirq++;
        }
@@ -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);
+                       __pci_msix_desc_mask_irq(msi, 1);
                else
-                       default_msi_mask_irq(msi, 1, 1);
+                       __pci_msi_desc_mask_irq(msi, 1, 1);
                irq_set_msi_desc(msi->irq, NULL);
                irq_free_desc(msi->irq);
                msi->msg.address_lo = 0;