summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-10-12 06:33:47 +0200
committerJens Axboe <axboe@kernel.dk>2013-11-08 17:10:27 +0100
commit370d6686683f44b6e869210eea2cf6a905b38a55 (patch)
tree0786f77204eec12713f2137837c8ac7346a59615 /drivers/block
parentblock: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff)
downloadlinux-370d6686683f44b6e869210eea2cf6a905b38a55.tar.xz
linux-370d6686683f44b6e869210eea2cf6a905b38a55.zip
mg_disk: remove deprecated IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/mg_disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 77a60bedd7a3..7bc363f1ee82 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -936,7 +936,7 @@ static int mg_probe(struct platform_device *plat_dev)
goto probe_err_3b;
}
err = request_irq(host->irq, mg_irq,
- IRQF_DISABLED | IRQF_TRIGGER_RISING,
+ IRQF_TRIGGER_RISING,
MG_DEV_NAME, host);
if (err) {
printk(KERN_ERR "%s:%d fail (request_irq err=%d)\n",