Commit 2f8d36e7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ralf Baechle

MIPS: PowerTV: Convert to new irq_chip functions

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2200/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0007b9bd
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
#include <asm/mach-powertv/asic_regs.h> #include <asm/mach-powertv/asic_regs.h>
static inline void unmask_asic_irq(unsigned int irq) static inline void unmask_asic_irq(struct irq_data *d)
{ {
unsigned long enable_bit; unsigned long enable_bit;
unsigned int irq = d->irq;
enable_bit = (1 << (irq & 0x1f)); enable_bit = (1 << (irq & 0x1f));
...@@ -45,9 +46,10 @@ static inline void unmask_asic_irq(unsigned int irq) ...@@ -45,9 +46,10 @@ static inline void unmask_asic_irq(unsigned int irq)
} }
} }
static inline void mask_asic_irq(unsigned int irq) static inline void mask_asic_irq(struct irq_data *d)
{ {
unsigned long disable_mask; unsigned long disable_mask;
unsigned int irq = d->irq;
disable_mask = ~(1 << (irq & 0x1f)); disable_mask = ~(1 << (irq & 0x1f));
...@@ -71,11 +73,8 @@ static inline void mask_asic_irq(unsigned int irq) ...@@ -71,11 +73,8 @@ static inline void mask_asic_irq(unsigned int irq)
static struct irq_chip asic_irq_chip = { static struct irq_chip asic_irq_chip = {
.name = "ASIC Level", .name = "ASIC Level",
.ack = mask_asic_irq, .irq_mask = mask_asic_irq,
.mask = mask_asic_irq, .irq_unmask = unmask_asic_irq,
.mask_ack = mask_asic_irq,
.unmask = unmask_asic_irq,
.eoi = unmask_asic_irq,
}; };
void __init asic_irq_init(void) void __init asic_irq_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment