Browse Source

MIPS: LASAt: Convert to new irq_chip functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2184/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thomas Gleixner 14 years ago
parent
commit
9fcecaf02d
1 changed files with 8 additions and 8 deletions
  1. 8 8
      arch/mips/lasat/interrupt.c

+ 8 - 8
arch/mips/lasat/interrupt.c

@@ -32,24 +32,24 @@ static volatile int *lasat_int_status;
 static volatile int *lasat_int_mask;
 static volatile int *lasat_int_mask;
 static volatile int lasat_int_mask_shift;
 static volatile int lasat_int_mask_shift;
 
 
-void disable_lasat_irq(unsigned int irq_nr)
+void disable_lasat_irq(struct irq_data *d)
 {
 {
-	irq_nr -= LASAT_IRQ_BASE;
+	unsigned int irq_nr = d->irq - LASAT_IRQ_BASE;
+
 	*lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
 	*lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
 }
 }
 
 
-void enable_lasat_irq(unsigned int irq_nr)
+void enable_lasat_irq(struct irq_data *d)
 {
 {
-	irq_nr -= LASAT_IRQ_BASE;
+	unsigned int irq_nr = d->irq - LASAT_IRQ_BASE;
+
 	*lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
 	*lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
 }
 }
 
 
 static struct irq_chip lasat_irq_type = {
 static struct irq_chip lasat_irq_type = {
 	.name = "Lasat",
 	.name = "Lasat",
-	.ack = disable_lasat_irq,
-	.mask = disable_lasat_irq,
-	.mask_ack = disable_lasat_irq,
-	.unmask = enable_lasat_irq,
+	.irq_mask = disable_lasat_irq,
+	.irq_unmask = enable_lasat_irq,
 };
 };
 
 
 static inline int ls1bit32(unsigned int x)
 static inline int ls1bit32(unsigned int x)