diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-18 17:52:52 +0100 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2011-03-18 17:52:52 +0100 |
commit | b023ba598c86747ded27d549f0225cf384c2e132 (patch) | |
tree | c4ce5128b94baf5fe993b1447e9c1869c0014faf /arch/mn10300 | |
parent | MN10300: Convert cpu irq_chips to new functions (diff) | |
download | linux-b023ba598c86747ded27d549f0225cf384c2e132.tar.xz linux-b023ba598c86747ded27d549f0225cf384c2e132.zip |
MN10300: Convert serial 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/mn10300')
-rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index 94f3b54c6eca..93c53739cfc9 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c @@ -384,16 +384,21 @@ static void mn10300_serial_mask_ack(unsigned int irq) arch_local_irq_restore(flags); } -static void mn10300_serial_nop(unsigned int irq) +static void mn10300_serial_chip_mask_ack(struct irq_data *d) +{ + mn10300_serial_mask_ack(d->irq); +} + +static void mn10300_serial_nop(struct irq_data *d) { } static struct irq_chip mn10300_serial_pic = { .name = "mnserial", - .ack = mn10300_serial_mask_ack, - .mask = mn10300_serial_mask_ack, - .mask_ack = mn10300_serial_mask_ack, - .unmask = mn10300_serial_nop, + .irq_ack = mn10300_serial_chip_mask_ack, + .irq_mask = mn10300_serial_chip_mask_ack, + .irq_mask_ack = mn10300_serial_chip_mask_ack, + .irq_unmask = mn10300_serial_nop, }; |