1 files changed, 12 insertions, 24 deletions

diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 20a1bce1a031..e605298e3aee 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -86,7 +86,7 @@ irqreturn_t gsc_asic_intr(int gsc_asic_irq, void *dev)
         do {
                 int local_irq = __ffs(irr);
                 unsigned int irq = gsc_asic->global_irq[local_irq];
-                __do_IRQ(irq);
+                generic_handle_irq(irq);
                 irr &= ~(1 << local_irq);
         } while (irr);
 
@@ -105,10 +105,9 @@ int gsc_find_local_irq(unsigned int irq, int *global_irqs, int limit)
         return NO_IRQ;
 }
 
-static void gsc_asic_disable_irq(unsigned int irq)
+static void gsc_asic_mask_irq(unsigned int irq)
 {
-        struct irq_desc *desc = irq_to_desc(irq);
-        struct gsc_asic *irq_dev = desc->chip_data;
+        struct gsc_asic *irq_dev = get_irq_chip_data(irq);
         int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
         u32 imr;
 
@@ -121,10 +120,9 @@ static void gsc_asic_disable_irq(unsigned int irq)
         gsc_writel(imr, irq_dev->hpa + OFFSET_IMR);
 }
 
-static void gsc_asic_enable_irq(unsigned int irq)
+static void gsc_asic_unmask_irq(unsigned int irq)
 {
-        struct irq_desc *desc = irq_to_desc(irq);
-        struct gsc_asic *irq_dev = desc->chip_data;
+        struct gsc_asic *irq_dev = get_irq_chip_data(irq);
         int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
         u32 imr;
 
@@ -141,33 +139,23 @@ static void gsc_asic_enable_irq(unsigned int irq)
          */
 }
 
-static unsigned int gsc_asic_startup_irq(unsigned int irq)
-{
-        gsc_asic_enable_irq(irq);
-        return 0;
-}
-
 static struct irq_chip gsc_asic_interrupt_type = {
-        .name    =      "GSC-ASIC",
-        .startup =      gsc_asic_startup_irq,
-        .shutdown =     gsc_asic_disable_irq,
-        .enable =       gsc_asic_enable_irq,
-        .disable =      gsc_asic_disable_irq,
-        .ack =          no_ack_irq,
-        .end =          no_end_irq,
+        .name   =       "GSC-ASIC",
+        .unmask =       gsc_asic_unmask_irq,
+        .mask   =       gsc_asic_mask_irq,
+        .ack    =       no_ack_irq,
 };
 
 int gsc_assign_irq(struct irq_chip *type, void *data)
 {
         static int irq = GSC_IRQ_BASE;
-        struct irq_desc *desc;
 
         if (irq > GSC_IRQ_MAX)
                 return NO_IRQ;
 
-        desc = irq_to_desc(irq);
-        desc->chip = type;
-        desc->chip_data = data;
+        set_irq_chip_and_handler(irq, type, handle_level_irq);
+        set_irq_chip_data(irq, data);
+
         return irq++;
 }