2014-10-01 10:07:12

by Michael Opdenacker

Subject: [PATCH] [RESEND] 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 <[email protected]>
---
drivers/block/hd.c | 12 +-----------
1 file changed, 1 insertion(+), 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 = {
.getgeo = hd_getgeo,
};

-/*
- * This is the hard disk IRQ description. The IRQF_DISABLED in sa_flags
- * means we run the IRQ-handler with interrupts disabled: this is bad for
- * interrupt latency, but anything else has led to problems on some
- * machines.
- *
- * We enable interrupts in some of the routines after making sure it's
- * safe.
- */
-
static int __init hd_init(void)
{
int drive;
@@ -761,7 +751,7 @@ static int __init hd_init(void)
p->cyl, p->head, p->sect);
}

- if (request_irq(HD_IRQ, hd_interrupt, IRQF_DISABLED, "hd", NULL)) {
+ if (request_irq(HD_IRQ, hd_interrupt, 0, "hd", NULL)) {
printk("hd: unable to get IRQ%d for the hard disk driver\n",
HD_IRQ);
goto out1;
--
1.9.1

2014-10-01 14:16:41

by Jens Axboe

Subject: Re: [PATCH] [RESEND] block: hd: remove deprecated IRQF_DISABLED

On 2014-10-01 04:07, Michael Opdenacker wrote:
> 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.

Thanks, applied.

--
Jens Axboe