diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-11-29 10:31:33 +0100 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2011-01-13 17:18:34 +0100 |
| commit | c3ef3ccadb0d8fc4f8de89a63edf0cee979a7235 (patch) | |
| tree | e91c056c265a6d0086e6b2e98f88600cc6ff2787 /arch/arm/mach-integrator/integrator_ap.c | |
| parent | c971ab0d9649d2bc0469da3c976297e91a3e2d35 (diff) | |
| download | linux-c3ef3ccadb0d8fc4f8de89a63edf0cee979a7235.tar.gz linux-c3ef3ccadb0d8fc4f8de89a63edf0cee979a7235.tar.bz2 linux-c3ef3ccadb0d8fc4f8de89a63edf0cee979a7235.zip | |
ARM: integrator: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 2774df8021dc..b666443b5cbb 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -156,21 +156,21 @@ static void __init ap_map_io(void) #define INTEGRATOR_SC_VALID_INT 0x003fffff -static void sc_mask_irq(unsigned int irq) +static void sc_mask_irq(struct irq_data *d) { - writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR); + writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_CLEAR); } -static void sc_unmask_irq(unsigned int irq) +static void sc_unmask_irq(struct irq_data *d) { - writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET); + writel(1 << d->irq, VA_IC_BASE + IRQ_ENABLE_SET); } static struct irq_chip sc_chip = { - .name = "SC", - .ack = sc_mask_irq, - .mask = sc_mask_irq, - .unmask = sc_unmask_irq, + .name = "SC", + .irq_ack = sc_mask_irq, + .irq_mask = sc_mask_irq, + .irq_unmask = sc_unmask_irq, }; static void __init ap_init_irq(void) |