Fix common misspellings

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / sparc / kernel / pci_msi.c

diff --git a/arch/sparc/kernel/pci_msi.c b/arch/sparc/kernel/pci_msi.c
index 550e937720e70c3df552f1b68cadd90e39a85cc0..30982e9ab62669ae90ce804c977b3cdb7b20c6e8 100644 (file)
--- a/arch/sparc/kernel/pci_msi.c
+++ b/arch/sparc/kernel/pci_msi.c
@@ -30,13 +30,10 @@ static irqreturn_t sparc64_msiq_interrupt(int irq, void *cookie)
 
                err = ops->dequeue_msi(pbm, msiqid, &head, &msi);
                if (likely(err > 0)) {
-                       struct irq_desc *desc;
                        unsigned int irq;
 
                        irq = pbm->msi_irq_table[msi - pbm->msi_first];
-                       desc = irq_desc + irq;
-
-                       desc->handle_irq(irq, desc);
+                       generic_handle_irq(irq);
                }
 
                if (unlikely(err < 0))
@@ -136,8 +133,8 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p,
        if (!*irq_p)
                goto out_err;
 
-       set_irq_chip_and_handler_name(*irq_p, &msi_irq,
-                                     handle_simple_irq, "MSI");
+       irq_set_chip_and_handler_name(*irq_p, &msi_irq, handle_simple_irq,
+                                     "MSI");
 
        err = alloc_msi(pbm);
        if (unlikely(err < 0))
@@ -163,7 +160,7 @@ static int sparc64_setup_msi_irq(unsigned int *irq_p,
        }
        msg.data = msi;
 
-       set_irq_msi(*irq_p, entry);
+       irq_set_msi_desc(*irq_p, entry);
        write_msi_msg(*irq_p, &msg);
 
        return 0;
@@ -172,7 +169,7 @@ out_msi_free:
        free_msi(pbm, msi);
 
 out_irq_free:
-       set_irq_chip(*irq_p, NULL);
+       irq_set_chip(*irq_p, NULL);
        irq_free(*irq_p);
        *irq_p = 0;
 
@@ -211,7 +208,7 @@ static void sparc64_teardown_msi_irq(unsigned int irq,
 
        free_msi(pbm, msi_num);
 
-       set_irq_chip(irq, NULL);
+       irq_set_chip(irq, NULL);
        irq_free(irq);
 }