1 files changed, 28 insertions, 30 deletions

diff --git a/arch/sparc/kernel/pci_msi.c b/arch/sparc/kernel/pci_msi.c
index 548b8ca9c210..580651af73f2 100644
--- 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 virt_irq;
+                        unsigned int irq;
 
-                        virt_irq = pbm->msi_irq_table[msi - pbm->msi_first];
-                        desc = irq_desc + virt_irq;
-
-                        desc->handle_irq(virt_irq, desc);
+                        irq = pbm->msi_irq_table[msi - pbm->msi_first];
+                        generic_handle_irq(irq);
                 }
 
                 if (unlikely(err < 0))
@@ -114,14 +111,14 @@ static void free_msi(struct pci_pbm_info *pbm, int msi_num)
 
 static struct irq_chip msi_irq = {
         .name           = "PCI-MSI",
-        .mask           = mask_msi_irq,
-        .unmask         = unmask_msi_irq,
-        .enable         = unmask_msi_irq,
-        .disable        = mask_msi_irq,
+        .irq_mask       = mask_msi_irq,
+        .irq_unmask     = unmask_msi_irq,
+        .irq_enable     = unmask_msi_irq,
+        .irq_disable    = mask_msi_irq,
         /* XXX affinity XXX */
 };
 
-static int sparc64_setup_msi_irq(unsigned int *virt_irq_p,
+static int sparc64_setup_msi_irq(unsigned int *irq_p,
                                  struct pci_dev *pdev,
                                  struct msi_desc *entry)
 {
@@ -131,17 +128,17 @@ static int sparc64_setup_msi_irq(unsigned int *virt_irq_p,
         int msi, err;
         u32 msiqid;
 
-        *virt_irq_p = virt_irq_alloc(0, 0);
+        *irq_p = irq_alloc(0, 0);
         err = -ENOMEM;
-        if (!*virt_irq_p)
+        if (!*irq_p)
                 goto out_err;
 
-        set_irq_chip_and_handler_name(*virt_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))
-                goto out_virt_irq_free;
+                goto out_irq_free;
 
         msi = err;
 
@@ -152,7 +149,7 @@ static int sparc64_setup_msi_irq(unsigned int *virt_irq_p,
         if (err)
                 goto out_msi_free;
 
-        pbm->msi_irq_table[msi - pbm->msi_first] = *virt_irq_p;
+        pbm->msi_irq_table[msi - pbm->msi_first] = *irq_p;
 
         if (entry->msi_attrib.is_64) {
                 msg.address_hi = pbm->msi64_start >> 32;
@@ -163,24 +160,24 @@ static int sparc64_setup_msi_irq(unsigned int *virt_irq_p,
         }
         msg.data = msi;
 
-        set_irq_msi(*virt_irq_p, entry);
-        write_msi_msg(*virt_irq_p, &msg);
+        irq_set_msi_desc(*irq_p, entry);
+        write_msi_msg(*irq_p, &msg);
 
         return 0;
 
 out_msi_free:
         free_msi(pbm, msi);
 
-out_virt_irq_free:
-        set_irq_chip(*virt_irq_p, NULL);
-        virt_irq_free(*virt_irq_p);
-        *virt_irq_p = 0;
+out_irq_free:
+        irq_set_chip(*irq_p, NULL);
+        irq_free(*irq_p);
+        *irq_p = 0;
 
 out_err:
         return err;
 }
 
-static void sparc64_teardown_msi_irq(unsigned int virt_irq,
+static void sparc64_teardown_msi_irq(unsigned int irq,
                                      struct pci_dev *pdev)
 {
         struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
@@ -189,12 +186,12 @@ static void sparc64_teardown_msi_irq(unsigned int virt_irq,
         int i, err;
 
         for (i = 0; i < pbm->msi_num; i++) {
-                if (pbm->msi_irq_table[i] == virt_irq)
+                if (pbm->msi_irq_table[i] == irq)
                         break;
         }
         if (i >= pbm->msi_num) {
                 printk(KERN_ERR "%s: teardown: No MSI for irq %u\n",
-                       pbm->name, virt_irq);
+                       pbm->name, irq);
                 return;
         }
 
@@ -205,14 +202,14 @@ static void sparc64_teardown_msi_irq(unsigned int virt_irq,
         if (err) {
                 printk(KERN_ERR "%s: teardown: ops->teardown() on MSI %u, "
                        "irq %u, gives error %d\n",
-                       pbm->name, msi_num, virt_irq, err);
+                       pbm->name, msi_num, irq, err);
                 return;
         }
 
         free_msi(pbm, msi_num);
 
-        set_irq_chip(virt_irq, NULL);
-        virt_irq_free(virt_irq);
+        irq_set_chip(irq, NULL);
+        irq_free(irq);
 }
 
 static int msi_bitmap_alloc(struct pci_pbm_info *pbm)
@@ -287,8 +284,9 @@ static int bringup_one_msi_queue(struct pci_pbm_info *pbm,
 
         nid = pbm->numa_node;
         if (nid != -1) {
-                cpumask_t numa_mask = *cpumask_of_node(nid);
+                cpumask_t numa_mask;
 
+                cpumask_copy(&numa_mask, cpumask_of_node(nid));
                 irq_set_affinity(irq, &numa_mask);
         }
         err = request_irq(irq, sparc64_msiq_interrupt, 0,