diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:53 -0400 |
commit | 1d6f359a2e06296418481239f8054a878f36e819 (patch) | |
tree | e3ce0c69e4f34374f51f4e226374467ca80e3993 /drivers/scsi/aacraid | |
parent | 5d8c8a2e8edc63d8aef7656678f41c6c603f0443 (diff) |
[PATCH] irq-flags: scsi: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/aacraid')
-rw-r--r-- | drivers/scsi/aacraid/rkt.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aacraid/rx.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aacraid/sa.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c index 5b52966bbbf3..458ea897fd72 100644 --- a/drivers/scsi/aacraid/rkt.c +++ b/drivers/scsi/aacraid/rkt.c | |||
@@ -453,7 +453,7 @@ int aac_rkt_init(struct aac_dev *dev) | |||
453 | } | 453 | } |
454 | msleep(1); | 454 | msleep(1); |
455 | } | 455 | } |
456 | if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) | 456 | if (request_irq(dev->scsi_host_ptr->irq, aac_rkt_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev)<0) |
457 | { | 457 | { |
458 | printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance); | 458 | printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance); |
459 | goto error_iounmap; | 459 | goto error_iounmap; |
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c index 9dadfb28b3f1..035018db69b1 100644 --- a/drivers/scsi/aacraid/rx.c +++ b/drivers/scsi/aacraid/rx.c | |||
@@ -453,7 +453,7 @@ int aac_rx_init(struct aac_dev *dev) | |||
453 | } | 453 | } |
454 | msleep(1); | 454 | msleep(1); |
455 | } | 455 | } |
456 | if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev)<0) | 456 | if (request_irq(dev->scsi_host_ptr->irq, aac_rx_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev)<0) |
457 | { | 457 | { |
458 | printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance); | 458 | printk(KERN_ERR "%s%d: Interrupt unavailable.\n", name, instance); |
459 | goto error_iounmap; | 459 | goto error_iounmap; |
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c index 88d400fccc94..cd586cc8f9be 100644 --- a/drivers/scsi/aacraid/sa.c +++ b/drivers/scsi/aacraid/sa.c | |||
@@ -327,7 +327,7 @@ int aac_sa_init(struct aac_dev *dev) | |||
327 | msleep(1); | 327 | msleep(1); |
328 | } | 328 | } |
329 | 329 | ||
330 | if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) { | 330 | if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, IRQF_SHARED|IRQF_DISABLED, "aacraid", (void *)dev ) < 0) { |
331 | printk(KERN_WARNING "%s%d: Interrupt unavailable.\n", name, instance); | 331 | printk(KERN_WARNING "%s%d: Interrupt unavailable.\n", name, instance); |
332 | goto error_iounmap; | 332 | goto error_iounmap; |
333 | } | 333 | } |