summaryrefslogtreecommitdiff
path: root/arch/sh/drivers/push-switch.c
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2011-10-22 13:56:28 +0400
committerPaul Mundt <lethal@linux-sh.org>2011-10-28 09:39:28 +0400
commitd11584a0449f881181dc94dd697d3f3896c15c73 (patch)
tree0ca8ec496e6ba3a5ae687b8ba4cea5f55cc5bec2 /arch/sh/drivers/push-switch.c
parentc63bcc6ff135397b38cdb510c173e4a6629cede5 (diff)
downloadlinux-d11584a0449f881181dc94dd697d3f3896c15c73.tar.xz
SH: 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> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/push-switch.c')
-rw-r--r--arch/sh/drivers/push-switch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/push-switch.c b/arch/sh/drivers/push-switch.c
index afc24556572b..637b79b09657 100644
--- a/arch/sh/drivers/push-switch.c
+++ b/arch/sh/drivers/push-switch.c
@@ -63,7 +63,7 @@ static int switch_drv_probe(struct platform_device *pdev)
BUG_ON(!psw_info);
ret = request_irq(irq, psw_info->irq_handler,
- IRQF_DISABLED | psw_info->irq_flags,
+ psw_info->irq_flags,
psw_info->name ? psw_info->name : DRV_NAME, pdev);
if (unlikely(ret < 0))
goto err;