Merge branch 'irq-irqdomain-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / arch / mips / pci / msi-xlp.c

diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c
index f7ac3edda1b211a512ae0afe6e633a421cda7664..6a40f24c91b467564cf5d2c886ecec39df411874 100644 (file)
--- a/arch/mips/pci/msi-xlp.c
+++ b/arch/mips/pci/msi-xlp.c
@@ -217,7 +217,7 @@ static void xlp_msix_mask_ack(struct irq_data *d)
 
        msixvec = nlm_irq_msixvec(d->irq);
        link = nlm_irq_msixlink(msixvec);
-       mask_msi_irq(d);
+       pci_msi_mask_irq(d);
        md = irq_data_get_irq_handler_data(d);
 
        /* Ack MSI on bridge */
@@ -239,10 +239,10 @@ static void xlp_msix_mask_ack(struct irq_data *d)
 
 static struct irq_chip xlp_msix_chip = {
        .name           = "XLP-MSIX",
-       .irq_enable     = unmask_msi_irq,
-       .irq_disable    = mask_msi_irq,
+       .irq_enable     = pci_msi_unmask_irq,
+       .irq_disable    = pci_msi_mask_irq,
        .irq_mask_ack   = xlp_msix_mask_ack,
-       .irq_unmask     = unmask_msi_irq,
+       .irq_unmask     = pci_msi_unmask_irq,
 };
 
 void arch_teardown_msi_irq(unsigned int irq)
@@ -345,7 +345,7 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link,
        if (ret < 0)
                return ret;
 
-       write_msi_msg(xirq, &msg);
+       pci_write_msi_msg(xirq, &msg);
        return 0;
 }
 
@@ -446,7 +446,7 @@ static int xlp_setup_msix(uint64_t lnkbase, int node, int link,
        if (ret < 0)
                return ret;
 
-       write_msi_msg(xirq, &msg);
+       pci_write_msi_msg(xirq, &msg);
        return 0;
 }