diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-06 22:45:34 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-14 19:37:39 +0100 |
| commit | 1d119aa06fb2b2608151a162f15c480d46694b65 (patch) | |
| tree | dcc6add4f4dd5109714dcc45740d70898f7e97e6 /arch/um | |
| parent | 6ea96e7e4946f790330557e4b7c4c8a174c1c6d2 (diff) | |
| download | linux-1d119aa06fb2b2608151a162f15c480d46694b65.tar.bz2 | |
um: Convert irq_chips to new functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <20110206224515.224027758@linutronix.de>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/kernel/irq.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index c9167485431e..f771b85833e3 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -360,10 +360,10 @@ EXPORT_SYMBOL(um_request_irq); EXPORT_SYMBOL(reactivate_fd); /* - * irq_chip must define (startup || enable) && - * (shutdown || disable) && end + * irq_chip must define at least enable/disable and ack when + * the edge handler is used. */ -static void dummy(unsigned int irq) +static void dummy(struct irq_data *d) { } @@ -371,18 +371,17 @@ static void dummy(unsigned int irq) static struct irq_chip normal_irq_type = { .name = "SIGIO", .release = free_irq_by_irq_and_dev, - .disable = dummy, - .enable = dummy, - .ack = dummy, + .irq_disable = dummy, + .irq_enable = dummy, + .irq_ack = dummy, }; static struct irq_chip SIGVTALRM_irq_type = { .name = "SIGVTALRM", .release = free_irq_by_irq_and_dev, - .shutdown = dummy, /* never called */ - .disable = dummy, - .enable = dummy, - .ack = dummy, + .irq_disable = dummy, + .irq_enable = dummy, + .irq_ack = dummy, }; void __init init_IRQ(void) |