[PATCH] irq-flags: UM: Use the new IRQF_ constants
Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
6741320247
commit
bd6aa6502e
@@ -373,7 +373,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data,
|
||||
int err;
|
||||
|
||||
/* Interrupts are enabled here because we registered the interrupt with
|
||||
* SA_INTERRUPT (see line_setup_irq).*/
|
||||
* IRQF_DISABLED (see line_setup_irq).*/
|
||||
|
||||
spin_lock_irq(&line->lock);
|
||||
err = flush_buffer(line);
|
||||
@@ -406,7 +406,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data,
|
||||
int line_setup_irq(int fd, int input, int output, struct line *line, void *data)
|
||||
{
|
||||
struct line_driver *driver = line->driver;
|
||||
int err = 0, flags = SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM;
|
||||
int err = 0, flags = IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM;
|
||||
|
||||
if (input)
|
||||
err = um_request_irq(driver->read_irq, fd, IRQ_READ,
|
||||
@@ -767,7 +767,7 @@ void register_winch_irq(int fd, int tty_fd, int pid, struct tty_struct *tty)
|
||||
spin_unlock(&winch_handler_lock);
|
||||
|
||||
if(um_request_irq(WINCH_IRQ, fd, IRQ_READ, winch_interrupt,
|
||||
SA_INTERRUPT | SA_SHIRQ | SA_SAMPLE_RANDOM,
|
||||
IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM,
|
||||
"winch", winch) < 0)
|
||||
printk("register_winch_irq - failed to register IRQ\n");
|
||||
}
|
||||
|
Reference in New Issue
Block a user