diff options
Diffstat (limited to 'arch/arm/mach-shark/irq.c')
-rw-r--r-- | arch/arm/mach-shark/irq.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/mach-shark/irq.c b/arch/arm/mach-shark/irq.c index c04eb6a1e2be..831fc66dfa4d 100644 --- a/arch/arm/mach-shark/irq.c +++ b/arch/arm/mach-shark/irq.c | |||
@@ -30,35 +30,35 @@ static unsigned char cached_irq_mask[2] = { 0xfb, 0xff }; | |||
30 | * These have to be protected by the irq controller spinlock | 30 | * These have to be protected by the irq controller spinlock |
31 | * before being called. | 31 | * before being called. |
32 | */ | 32 | */ |
33 | static void shark_disable_8259A_irq(unsigned int irq) | 33 | static void shark_disable_8259A_irq(struct irq_data *d) |
34 | { | 34 | { |
35 | unsigned int mask; | 35 | unsigned int mask; |
36 | if (irq<8) { | 36 | if (d->irq<8) { |
37 | mask = 1 << irq; | 37 | mask = 1 << d->irq; |
38 | cached_irq_mask[0] |= mask; | 38 | cached_irq_mask[0] |= mask; |
39 | outb(cached_irq_mask[1],0xA1); | 39 | outb(cached_irq_mask[1],0xA1); |
40 | } else { | 40 | } else { |
41 | mask = 1 << (irq-8); | 41 | mask = 1 << (d->irq-8); |
42 | cached_irq_mask[1] |= mask; | 42 | cached_irq_mask[1] |= mask; |
43 | outb(cached_irq_mask[0],0x21); | 43 | outb(cached_irq_mask[0],0x21); |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | static void shark_enable_8259A_irq(unsigned int irq) | 47 | static void shark_enable_8259A_irq(struct irq_data *d) |
48 | { | 48 | { |
49 | unsigned int mask; | 49 | unsigned int mask; |
50 | if (irq<8) { | 50 | if (d->irq<8) { |
51 | mask = ~(1 << irq); | 51 | mask = ~(1 << d->irq); |
52 | cached_irq_mask[0] &= mask; | 52 | cached_irq_mask[0] &= mask; |
53 | outb(cached_irq_mask[0],0x21); | 53 | outb(cached_irq_mask[0],0x21); |
54 | } else { | 54 | } else { |
55 | mask = ~(1 << (irq-8)); | 55 | mask = ~(1 << (d->irq-8)); |
56 | cached_irq_mask[1] &= mask; | 56 | cached_irq_mask[1] &= mask; |
57 | outb(cached_irq_mask[1],0xA1); | 57 | outb(cached_irq_mask[1],0xA1); |
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | static void shark_ack_8259A_irq(unsigned int irq){} | 61 | static void shark_ack_8259A_irq(struct irq_data *d){} |
62 | 62 | ||
63 | static irqreturn_t bogus_int(int irq, void *dev_id) | 63 | static irqreturn_t bogus_int(int irq, void *dev_id) |
64 | { | 64 | { |
@@ -69,10 +69,10 @@ static irqreturn_t bogus_int(int irq, void *dev_id) | |||
69 | static struct irqaction cascade; | 69 | static struct irqaction cascade; |
70 | 70 | ||
71 | static struct irq_chip fb_chip = { | 71 | static struct irq_chip fb_chip = { |
72 | .name = "XT-PIC", | 72 | .name = "XT-PIC", |
73 | .ack = shark_ack_8259A_irq, | 73 | .irq_ack = shark_ack_8259A_irq, |
74 | .mask = shark_disable_8259A_irq, | 74 | .irq_mask = shark_disable_8259A_irq, |
75 | .unmask = shark_enable_8259A_irq, | 75 | .irq_unmask = shark_enable_8259A_irq, |
76 | }; | 76 | }; |
77 | 77 | ||
78 | void __init shark_init_irq(void) | 78 | void __init shark_init_irq(void) |