diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2011-09-22 04:59:15 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-22 19:08:57 -0400 |
commit | 9cfb5c05fee914cc65d4706801f6bc424082b5f5 (patch) | |
tree | a71d33f1c89841b4e848546c0dedd9b880f473f7 /drivers/tty/hvc | |
parent | 94abc56f4d90f289ea32a0a11d3577fcd8cb28fb (diff) |
TTY: irq: Remove IRQF_DISABLED
Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],
We run all interrupt handlers with interrupts disabled
and we even check and yell when an interrupt handler
returns with interrupts enabled (see commit [b738a50a:
genirq: Warn when handler enables interrupts]).
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/hvc')
-rw-r--r-- | drivers/tty/hvc/hvc_irq.c | 2 | ||||
-rw-r--r-- | drivers/tty/hvc/hvcs.c | 2 | ||||
-rw-r--r-- | drivers/tty/hvc/hvsi.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/hvc/hvc_irq.c b/drivers/tty/hvc/hvc_irq.c index 2623e177e8d6..c9adb0559f61 100644 --- a/drivers/tty/hvc/hvc_irq.c +++ b/drivers/tty/hvc/hvc_irq.c | |||
@@ -28,7 +28,7 @@ int notifier_add_irq(struct hvc_struct *hp, int irq) | |||
28 | hp->irq_requested = 0; | 28 | hp->irq_requested = 0; |
29 | return 0; | 29 | return 0; |
30 | } | 30 | } |
31 | rc = request_irq(irq, hvc_handle_interrupt, IRQF_DISABLED, | 31 | rc = request_irq(irq, hvc_handle_interrupt, 0, |
32 | "hvc_console", hp); | 32 | "hvc_console", hp); |
33 | if (!rc) | 33 | if (!rc) |
34 | hp->irq_requested = 1; | 34 | hp->irq_requested = 1; |
diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c index e523773a5480..55882b5930a6 100644 --- a/drivers/tty/hvc/hvcs.c +++ b/drivers/tty/hvc/hvcs.c | |||
@@ -1057,7 +1057,7 @@ static int hvcs_enable_device(struct hvcs_struct *hvcsd, uint32_t unit_address, | |||
1057 | * the conn was registered and now. | 1057 | * the conn was registered and now. |
1058 | */ | 1058 | */ |
1059 | if (!(rc = request_irq(irq, &hvcs_handle_interrupt, | 1059 | if (!(rc = request_irq(irq, &hvcs_handle_interrupt, |
1060 | IRQF_DISABLED, "ibmhvcs", hvcsd))) { | 1060 | 0, "ibmhvcs", hvcsd))) { |
1061 | /* | 1061 | /* |
1062 | * It is possible the vty-server was removed after the irq was | 1062 | * It is possible the vty-server was removed after the irq was |
1063 | * requested but before we have time to enable interrupts. | 1063 | * requested but before we have time to enable interrupts. |
diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c index c94e2f5853d8..cdfa3e02d627 100644 --- a/drivers/tty/hvc/hvsi.c +++ b/drivers/tty/hvc/hvsi.c | |||
@@ -1105,7 +1105,7 @@ static int __init hvsi_init(void) | |||
1105 | struct hvsi_struct *hp = &hvsi_ports[i]; | 1105 | struct hvsi_struct *hp = &hvsi_ports[i]; |
1106 | int ret = 1; | 1106 | int ret = 1; |
1107 | 1107 | ||
1108 | ret = request_irq(hp->virq, hvsi_interrupt, IRQF_DISABLED, "hvsi", hp); | 1108 | ret = request_irq(hp->virq, hvsi_interrupt, 0, "hvsi", hp); |
1109 | if (ret) | 1109 | if (ret) |
1110 | printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n", | 1110 | printk(KERN_ERR "HVSI: couldn't reserve irq 0x%x (error %i)\n", |
1111 | hp->virq, ret); | 1111 | hp->virq, ret); |