diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-11-29 10:30:13 +0100 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@wantstofly.org> | 2011-01-13 17:18:30 +0100 |
| commit | dc2caf6c691c30867fb9a725ab15f60f392c429a (patch) | |
| tree | 198244b60a0ae4ff0dc97fe2ff5a34bebb144320 /arch/arm/mach-footbridge/common.c | |
| parent | c0afc916029c02a8650e533392893b3da6326d1e (diff) | |
| download | kernel_samsung_smdk4412-dc2caf6c691c30867fb9a725ab15f60f392c429a.zip kernel_samsung_smdk4412-dc2caf6c691c30867fb9a725ab15f60f392c429a.tar.gz kernel_samsung_smdk4412-dc2caf6c691c30867fb9a725ab15f60f392c429a.tar.bz2 | |
ARM: footbridge: 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-footbridge/common.c')
| -rw-r--r-- | arch/arm/mach-footbridge/common.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c index 88b3dd8..84c5f25 100644 --- a/arch/arm/mach-footbridge/common.c +++ b/arch/arm/mach-footbridge/common.c @@ -75,20 +75,20 @@ static const int fb_irq_mask[] = { IRQ_MASK_PCI_PERR, /* 19 */ }; -static void fb_mask_irq(unsigned int irq) +static void fb_mask_irq(struct irq_data *d) { - *CSR_IRQ_DISABLE = fb_irq_mask[_DC21285_INR(irq)]; + *CSR_IRQ_DISABLE = fb_irq_mask[_DC21285_INR(d->irq)]; } -static void fb_unmask_irq(unsigned int irq) +static void fb_unmask_irq(struct irq_data *d) { - *CSR_IRQ_ENABLE = fb_irq_mask[_DC21285_INR(irq)]; + *CSR_IRQ_ENABLE = fb_irq_mask[_DC21285_INR(d->irq)]; } static struct irq_chip fb_chip = { - .ack = fb_mask_irq, - .mask = fb_mask_irq, - .unmask = fb_unmask_irq, + .irq_ack = fb_mask_irq, + .irq_mask = fb_mask_irq, + .irq_unmask = fb_unmask_irq, }; static void __init __fb_init_irq(void) |