aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/apollo
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-04-17 16:53:04 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:47 -0500
commite8abf5e73cdb6c034d35ccba1f63a4801cd3dec5 (patch)
tree170de6cb1d0048757b2ab55b2a0bfeb87d274fd4 /arch/m68k/apollo
parent6549d537922da6a6893e9bc1be9c2b89db663719 (diff)
m68k/irq: Switch irq_chip methods to "struct irq_data *data"
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68k/apollo')
-rw-r--r--arch/m68k/apollo/dn_ints.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c
index d6e8f33466be..2bdab498b6c1 100644
--- a/arch/m68k/apollo/dn_ints.c
+++ b/arch/m68k/apollo/dn_ints.c
@@ -12,8 +12,10 @@ void dn_process_int(unsigned int irq, struct pt_regs *fp)
12 *(volatile unsigned char *)(picb)=0x20; 12 *(volatile unsigned char *)(picb)=0x20;
13} 13}
14 14
15unsigned int apollo_irq_startup(unsigned int irq) 15unsigned int apollo_irq_startup(struct irq_data *data)
16{ 16{
17 unsigned int irq = data->irq;
18
17 if (irq < 8) 19 if (irq < 8)
18 *(volatile unsigned char *)(pica+1) &= ~(1 << irq); 20 *(volatile unsigned char *)(pica+1) &= ~(1 << irq);
19 else 21 else
@@ -21,8 +23,10 @@ unsigned int apollo_irq_startup(unsigned int irq)
21 return 0; 23 return 0;
22} 24}
23 25
24void apollo_irq_shutdown(unsigned int irq) 26void apollo_irq_shutdown(struct irq_data *data)
25{ 27{
28 unsigned int irq = data->irq;
29
26 if (irq < 8) 30 if (irq < 8)
27 *(volatile unsigned char *)(pica+1) |= (1 << irq); 31 *(volatile unsigned char *)(pica+1) |= (1 << irq);
28 else 32 else