aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2014-10-01 06:07:07 -0400
committerJens Axboe <axboe@fb.com>2014-10-01 10:16:07 -0400
commitfc2021fb9baf9ed375c8161b40b68e120e75c60e (patch)
treea338bf56f6d6ea875f8223648bb7ba464154eb2c
parente9f05b4cfed38d0e57b0a705a7f480cfbe0c3247 (diff)
block: hd: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag from drivers/block/hd.c It's a NOOP since 2.6.35 and it will be removed one day. This also removes a related comment which is obsolete too. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/block/hd.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index 8a290c08262f..3abb121825bc 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -694,16 +694,6 @@ static const struct block_device_operations hd_fops = {
694 .getgeo = hd_getgeo, 694 .getgeo = hd_getgeo,
695}; 695};
696 696
697/*
698 * This is the hard disk IRQ description. The IRQF_DISABLED in sa_flags
699 * means we run the IRQ-handler with interrupts disabled: this is bad for
700 * interrupt latency, but anything else has led to problems on some
701 * machines.
702 *
703 * We enable interrupts in some of the routines after making sure it's
704 * safe.
705 */
706
707static int __init hd_init(void) 697static int __init hd_init(void)
708{ 698{
709 int drive; 699 int drive;
@@ -761,7 +751,7 @@ static int __init hd_init(void)
761 p->cyl, p->head, p->sect); 751 p->cyl, p->head, p->sect);
762 } 752 }
763 753
764 if (request_irq(HD_IRQ, hd_interrupt, IRQF_DISABLED, "hd", NULL)) { 754 if (request_irq(HD_IRQ, hd_interrupt, 0, "hd", NULL)) {
765 printk("hd: unable to get IRQ%d for the hard disk driver\n", 755 printk("hd: unable to get IRQ%d for the hard disk driver\n",
766 HD_IRQ); 756 HD_IRQ);
767 goto out1; 757 goto out1;