summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ebsa110
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-11-29 10:29:25 +0100
committerLennert Buytenhek <buytenh@wantstofly.org>2011-01-13 17:18:28 +0100
commitc365e506d18154bf430da10679e427abe982a84c (patch)
tree8987c65df84ed572616c10fd1ec4f9fbcc06b782 /arch/arm/mach-ebsa110
parentaa456a6eba197f0774d68531342ba7f85ccf2971 (diff)
downloadlinux-3.10-c365e506d18154bf430da10679e427abe982a84c.tar.gz
linux-3.10-c365e506d18154bf430da10679e427abe982a84c.tar.bz2
linux-3.10-c365e506d18154bf430da10679e427abe982a84c.zip
ARM: ebsa110: 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-ebsa110')
-rw-r--r--arch/arm/mach-ebsa110/core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 5df4099fc14..7df083f37fa 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -35,20 +35,20 @@
#define IRQ_STAT 0xff000000 /* read */
#define IRQ_MCLR 0xff000000 /* write */
-static void ebsa110_mask_irq(unsigned int irq)
+static void ebsa110_mask_irq(struct irq_data *d)
{
- __raw_writeb(1 << irq, IRQ_MCLR);
+ __raw_writeb(1 << d->irq, IRQ_MCLR);
}
-static void ebsa110_unmask_irq(unsigned int irq)
+static void ebsa110_unmask_irq(struct irq_data *d)
{
- __raw_writeb(1 << irq, IRQ_MSET);
+ __raw_writeb(1 << d->irq, IRQ_MSET);
}
static struct irq_chip ebsa110_irq_chip = {
- .ack = ebsa110_mask_irq,
- .mask = ebsa110_mask_irq,
- .unmask = ebsa110_unmask_irq,
+ .irq_ack = ebsa110_mask_irq,
+ .irq_mask = ebsa110_mask_irq,
+ .irq_unmask = ebsa110_unmask_irq,
};
static void __init ebsa110_init_irq(void)