diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 09:05:13 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-03-29 09:05:13 -0400 |
| commit | a4b48a494aef7ab2458b365e00eeebc6c0a2d997 (patch) | |
| tree | 018822fc391adb6a2d1015002af2672e5b8afe80 /arch/frv | |
| parent | 9148d88b120d260aa64fb21faaf18aa7a46b18a4 (diff) | |
frv: Convert mb93493 irq_chip to new functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/frv')
| -rw-r--r-- | arch/frv/kernel/irq-mb93493.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/frv/kernel/irq-mb93493.c b/arch/frv/kernel/irq-mb93493.c index ba55ecdfb245..4800f2402ecb 100644 --- a/arch/frv/kernel/irq-mb93493.c +++ b/arch/frv/kernel/irq-mb93493.c | |||
| @@ -45,46 +45,46 @@ | |||
| 45 | * daughter board PIC operations | 45 | * daughter board PIC operations |
| 46 | * - there is no way to ACK interrupts in the MB93493 chip | 46 | * - there is no way to ACK interrupts in the MB93493 chip |
| 47 | */ | 47 | */ |
| 48 | static void frv_mb93493_mask(unsigned int irq) | 48 | static void frv_mb93493_mask(struct irq_data *d) |
| 49 | { | 49 | { |
| 50 | uint32_t iqsr; | 50 | uint32_t iqsr; |
| 51 | volatile void *piqsr; | 51 | volatile void *piqsr; |
| 52 | 52 | ||
| 53 | if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493))) | 53 | if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493))) |
| 54 | piqsr = __addr_MB93493_IQSR(1); | 54 | piqsr = __addr_MB93493_IQSR(1); |
| 55 | else | 55 | else |
| 56 | piqsr = __addr_MB93493_IQSR(0); | 56 | piqsr = __addr_MB93493_IQSR(0); |
| 57 | 57 | ||
| 58 | iqsr = readl(piqsr); | 58 | iqsr = readl(piqsr); |
| 59 | iqsr &= ~(1 << (irq - IRQ_BASE_MB93493 + 16)); | 59 | iqsr &= ~(1 << (d->irq - IRQ_BASE_MB93493 + 16)); |
| 60 | writel(iqsr, piqsr); | 60 | writel(iqsr, piqsr); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | static void frv_mb93493_ack(unsigned int irq) | 63 | static void frv_mb93493_ack(struct irq_data *d) |
| 64 | { | 64 | { |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | static void frv_mb93493_unmask(unsigned int irq) | 67 | static void frv_mb93493_unmask(struct irq_data *d) |
| 68 | { | 68 | { |
| 69 | uint32_t iqsr; | 69 | uint32_t iqsr; |
| 70 | volatile void *piqsr; | 70 | volatile void *piqsr; |
| 71 | 71 | ||
| 72 | if (IRQ_ROUTING & (1 << (irq - IRQ_BASE_MB93493))) | 72 | if (IRQ_ROUTING & (1 << (d->irq - IRQ_BASE_MB93493))) |
| 73 | piqsr = __addr_MB93493_IQSR(1); | 73 | piqsr = __addr_MB93493_IQSR(1); |
| 74 | else | 74 | else |
| 75 | piqsr = __addr_MB93493_IQSR(0); | 75 | piqsr = __addr_MB93493_IQSR(0); |
| 76 | 76 | ||
| 77 | iqsr = readl(piqsr); | 77 | iqsr = readl(piqsr); |
| 78 | iqsr |= 1 << (irq - IRQ_BASE_MB93493 + 16); | 78 | iqsr |= 1 << (d->irq - IRQ_BASE_MB93493 + 16); |
| 79 | writel(iqsr, piqsr); | 79 | writel(iqsr, piqsr); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | static struct irq_chip frv_mb93493_pic = { | 82 | static struct irq_chip frv_mb93493_pic = { |
| 83 | .name = "mb93093", | 83 | .name = "mb93093", |
| 84 | .ack = frv_mb93493_ack, | 84 | .irq_ack = frv_mb93493_ack, |
| 85 | .mask = frv_mb93493_mask, | 85 | .irq_mask = frv_mb93493_mask, |
| 86 | .mask_ack = frv_mb93493_mask, | 86 | .irq_mask_ack = frv_mb93493_mask, |
| 87 | .unmask = frv_mb93493_unmask, | 87 | .irq_unmask = frv_mb93493_unmask, |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | /* | 90 | /* |