aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-11-29 05:14:16 -0500
committerLennert Buytenhek <buytenh@wantstofly.org>2011-01-13 11:19:03 -0500
commit76fbec842e176e57c2ba2c8efbac3367e59cc8f7 (patch)
treea91591ccf88954e8c8abc3ff87289fb41cf5b09e
parentcb55bc5f1b7d7a5fd8bfc901bca0ed099ee0e1e9 (diff)
ARM: tcc8k: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
-rw-r--r--arch/arm/mach-tcc8k/irq.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/arch/arm/mach-tcc8k/irq.c b/arch/arm/mach-tcc8k/irq.c
index 34575c4963f0..aa9231f4fc6e 100644
--- a/arch/arm/mach-tcc8k/irq.c
+++ b/arch/arm/mach-tcc8k/irq.c
@@ -18,65 +18,65 @@
18#include "common.h" 18#include "common.h"
19 19
20/* Disable IRQ */ 20/* Disable IRQ */
21static void tcc8000_mask_ack_irq0(unsigned int irq) 21static void tcc8000_mask_ack_irq0(struct irq_data *d)
22{ 22{
23 PIC0_IEN &= ~(1 << irq); 23 PIC0_IEN &= ~(1 << d->irq);
24 PIC0_CREQ |= (1 << irq); 24 PIC0_CREQ |= (1 << d->irq);
25} 25}
26 26
27static void tcc8000_mask_ack_irq1(unsigned int irq) 27static void tcc8000_mask_ack_irq1(struct irq_data *d)
28{ 28{
29 PIC1_IEN &= ~(1 << (irq - 32)); 29 PIC1_IEN &= ~(1 << (d->irq - 32));
30 PIC1_CREQ |= (1 << (irq - 32)); 30 PIC1_CREQ |= (1 << (d->irq - 32));
31} 31}
32 32
33static void tcc8000_mask_irq0(unsigned int irq) 33static void tcc8000_mask_irq0(struct irq_data *d)
34{ 34{
35 PIC0_IEN &= ~(1 << irq); 35 PIC0_IEN &= ~(1 << d->irq);
36} 36}
37 37
38static void tcc8000_mask_irq1(unsigned int irq) 38static void tcc8000_mask_irq1(struct irq_data *d)
39{ 39{
40 PIC1_IEN &= ~(1 << (irq - 32)); 40 PIC1_IEN &= ~(1 << (d->irq - 32));
41} 41}
42 42
43static void tcc8000_ack_irq0(unsigned int irq) 43static void tcc8000_ack_irq0(struct irq_data *d)
44{ 44{
45 PIC0_CREQ |= (1 << irq); 45 PIC0_CREQ |= (1 << d->irq);
46} 46}
47 47
48static void tcc8000_ack_irq1(unsigned int irq) 48static void tcc8000_ack_irq1(struct irq_data *d)
49{ 49{
50 PIC1_CREQ |= (1 << (irq - 32)); 50 PIC1_CREQ |= (1 << (d->irq - 32));
51} 51}
52 52
53/* Enable IRQ */ 53/* Enable IRQ */
54static void tcc8000_unmask_irq0(unsigned int irq) 54static void tcc8000_unmask_irq0(struct irq_data *d)
55{ 55{
56 PIC0_IEN |= (1 << irq); 56 PIC0_IEN |= (1 << d->irq);
57 PIC0_INTOEN |= (1 << irq); 57 PIC0_INTOEN |= (1 << d->irq);
58} 58}
59 59
60static void tcc8000_unmask_irq1(unsigned int irq) 60static void tcc8000_unmask_irq1(struct irq_data *d)
61{ 61{
62 PIC1_IEN |= (1 << (irq - 32)); 62 PIC1_IEN |= (1 << (d->irq - 32));
63 PIC1_INTOEN |= (1 << (irq - 32)); 63 PIC1_INTOEN |= (1 << (d->irq - 32));
64} 64}
65 65
66static struct irq_chip tcc8000_irq_chip0 = { 66static struct irq_chip tcc8000_irq_chip0 = {
67 .name = "tcc_irq0", 67 .name = "tcc_irq0",
68 .mask = tcc8000_mask_irq0, 68 .irq_mask = tcc8000_mask_irq0,
69 .ack = tcc8000_ack_irq0, 69 .irq_ack = tcc8000_ack_irq0,
70 .mask_ack = tcc8000_mask_ack_irq0, 70 .irq_mask_ack = tcc8000_mask_ack_irq0,
71 .unmask = tcc8000_unmask_irq0, 71 .irq_unmask = tcc8000_unmask_irq0,
72}; 72};
73 73
74static struct irq_chip tcc8000_irq_chip1 = { 74static struct irq_chip tcc8000_irq_chip1 = {
75 .name = "tcc_irq1", 75 .name = "tcc_irq1",
76 .mask = tcc8000_mask_irq1, 76 .irq_mask = tcc8000_mask_irq1,
77 .ack = tcc8000_ack_irq1, 77 .irq_ack = tcc8000_ack_irq1,
78 .mask_ack = tcc8000_mask_ack_irq1, 78 .irq_mask_ack = tcc8000_mask_ack_irq1,
79 .unmask = tcc8000_unmask_irq1, 79 .irq_unmask = tcc8000_unmask_irq1,
80}; 80};
81 81
82void __init tcc8k_init_irq(void) 82void __init tcc8k_init_irq(void)