aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/lirc
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2011-09-07 16:10:22 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-16 20:09:38 +0200
commit18e9351e453fbcf445cb8ffdd2e106e0212166da (patch)
treecab49bc86b7089c83b017ffb2328efd8849c884d /drivers/staging/lirc
parent6f27457b50c0439388e34d528f0fc200ddedb9a4 (diff)
staging: irq: Remove IRQF_DISABLED
This flag is a NOOP and can be removed now. Signed-off-by: Yong Zhang <yong.zhang0@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/lirc')
-rw-r--r--drivers/staging/lirc/lirc_serial.c2
-rw-r--r--drivers/staging/lirc/lirc_sir.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index 805df913bb6..8a060a8a722 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -841,7 +841,7 @@ static int init_port(void)
int i, nlow, nhigh, result;
result = request_irq(irq, irq_handler,
- IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0),
+ (share_irq ? IRQF_SHARED : 0),
LIRC_DRIVER_NAME, (void *)&hardware);
switch (result) {
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c
index 0d3864594b1..6903d3992ec 100644
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/lirc/lirc_sir.c
@@ -967,7 +967,7 @@ static int init_port(void)
return -EBUSY;
}
#endif
- retval = request_irq(irq, sir_interrupt, IRQF_DISABLED,
+ retval = request_irq(irq, sir_interrupt, 0,
LIRC_DRIVER_NAME, NULL);
if (retval < 0) {
# ifndef LIRC_ON_SA1100