summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-highlander.c
diff options
context:
space:
mode:
authorYong Zhang <yong.zhang0@gmail.com>2011-09-21 11:28:33 +0200
committerBen Dooks <ben-linux@fluff.org>2011-10-29 10:55:45 +0200
commit4311051c358ad0e66b68934e7a33cf10ba533466 (patch)
tree69ff508ee8fe09f63366acfbe5e3480399689276 /drivers/i2c/busses/i2c-highlander.c
parentMerge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kern... (diff)
downloadlinux-4311051c358ad0e66b68934e7a33cf10ba533466.tar.xz
linux-4311051c358ad0e66b68934e7a33cf10ba533466.zip
i2c: irq: Remove IRQF_DISABLED
Since commit [c58543c8: 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: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Barry Song <21cnbao@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-highlander.c')
-rw-r--r--drivers/i2c/busses/i2c-highlander.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c
index 3876a2478bd7..63bb1cc2a042 100644
--- a/drivers/i2c/busses/i2c-highlander.c
+++ b/drivers/i2c/busses/i2c-highlander.c
@@ -387,7 +387,7 @@ static int __devinit highlander_i2c_probe(struct platform_device *pdev)
dev->irq = 0;
if (dev->irq) {
- ret = request_irq(dev->irq, highlander_i2c_irq, IRQF_DISABLED,
+ ret = request_irq(dev->irq, highlander_i2c_irq, 0,
pdev->name, dev);
if (unlikely(ret))
goto err_unmap;