diff options
Diffstat (limited to 'arch/h8300/kernel/irq.c')
| -rw-r--r-- | arch/h8300/kernel/irq.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c index c25dc2c2b1da..e23f34647889 100644 --- a/arch/h8300/kernel/irq.c +++ b/arch/h8300/kernel/irq.c | |||
| @@ -38,34 +38,34 @@ static inline int is_ext_irq(unsigned int irq) | |||
| 38 | return (irq >= EXT_IRQ0 && irq <= (EXT_IRQ0 + EXT_IRQS)); | 38 | return (irq >= EXT_IRQ0 && irq <= (EXT_IRQ0 + EXT_IRQS)); |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | static void h8300_enable_irq(unsigned int irq) | 41 | static void h8300_enable_irq(struct irq_data *data) |
| 42 | { | 42 | { |
| 43 | if (is_ext_irq(irq)) | 43 | if (is_ext_irq(data->irq)) |
| 44 | IER_REGS |= 1 << (irq - EXT_IRQ0); | 44 | IER_REGS |= 1 << (data->irq - EXT_IRQ0); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | static void h8300_disable_irq(unsigned int irq) | 47 | static void h8300_disable_irq(struct irq_data *data) |
| 48 | { | 48 | { |
| 49 | if (is_ext_irq(irq)) | 49 | if (is_ext_irq(data->irq)) |
| 50 | IER_REGS &= ~(1 << (irq - EXT_IRQ0)); | 50 | IER_REGS &= ~(1 << (data->irq - EXT_IRQ0)); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | static void h8300_end_irq(unsigned int irq) | 53 | static void h8300_end_irq(unsigned int irq) |
| 54 | { | 54 | { |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | static unsigned int h8300_startup_irq(unsigned int irq) | 57 | static unsigned int h8300_startup_irq(struct irq_data *data) |
| 58 | { | 58 | { |
| 59 | if (is_ext_irq(irq)) | 59 | if (is_ext_irq(data->irq)) |
| 60 | return h8300_enable_irq_pin(irq); | 60 | return h8300_enable_irq_pin(data->irq); |
| 61 | else | 61 | else |
| 62 | return 0; | 62 | return 0; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | static void h8300_shutdown_irq(unsigned int irq) | 65 | static void h8300_shutdown_irq(struct irq_data *data) |
| 66 | { | 66 | { |
| 67 | if (is_ext_irq(irq)) | 67 | if (is_ext_irq(data->irq)) |
| 68 | h8300_disable_irq_pin(irq); | 68 | h8300_disable_irq_pin(data->irq); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | /* | 71 | /* |
| @@ -73,11 +73,10 @@ static void h8300_shutdown_irq(unsigned int irq) | |||
| 73 | */ | 73 | */ |
| 74 | struct irq_chip h8300irq_chip = { | 74 | struct irq_chip h8300irq_chip = { |
| 75 | .name = "H8300-INTC", | 75 | .name = "H8300-INTC", |
| 76 | .startup = h8300_startup_irq, | 76 | .irq_startup = h8300_startup_irq, |
| 77 | .shutdown = h8300_shutdown_irq, | 77 | .irq_shutdown = h8300_shutdown_irq, |
| 78 | .enable = h8300_enable_irq, | 78 | .irq_enable = h8300_enable_irq, |
| 79 | .disable = h8300_disable_irq, | 79 | .irq_disable = h8300_disable_irq, |
| 80 | .ack = NULL, | ||
| 81 | .end = h8300_end_irq, | 80 | .end = h8300_end_irq, |
| 82 | }; | 81 | }; |
| 83 | 82 | ||