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/ibmmca.c | |
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/ibmmca.c')
-rw-r--r-- | drivers/scsi/ibmmca.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 1cbc94842cc6..2be1dc5d852a 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
@@ -1510,7 +1510,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template) | |||
1510 | #endif | 1510 | #endif |
1511 | 1511 | ||
1512 | /* get interrupt request level */ | 1512 | /* get interrupt request level */ |
1513 | if (request_irq(IM_IRQ, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) { | 1513 | if (request_irq(IM_IRQ, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) { |
1514 | printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ); | 1514 | printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ); |
1515 | return 0; | 1515 | return 0; |
1516 | } else | 1516 | } else |
@@ -1635,7 +1635,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template) | |||
1635 | /* IRQ11 is used by SCSI-2 F/W Adapter/A */ | 1635 | /* IRQ11 is used by SCSI-2 F/W Adapter/A */ |
1636 | printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n"); | 1636 | printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n"); |
1637 | /* get interrupt request level */ | 1637 | /* get interrupt request level */ |
1638 | if (request_irq(IM_IRQ_FW, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) { | 1638 | if (request_irq(IM_IRQ_FW, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) { |
1639 | printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW); | 1639 | printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW); |
1640 | } else | 1640 | } else |
1641 | IRQ11_registered++; | 1641 | IRQ11_registered++; |
@@ -1696,7 +1696,7 @@ int ibmmca_detect(struct scsi_host_template * scsi_template) | |||
1696 | /* IRQ11 is used by SCSI-2 F/W Adapter/A */ | 1696 | /* IRQ11 is used by SCSI-2 F/W Adapter/A */ |
1697 | printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n"); | 1697 | printk(KERN_DEBUG "IBM MCA SCSI: SCSI-2 F/W adapter needs IRQ 11.\n"); |
1698 | /* get interrupt request level */ | 1698 | /* get interrupt request level */ |
1699 | if (request_irq(IM_IRQ_FW, interrupt_handler, SA_SHIRQ, "ibmmcascsi", hosts)) | 1699 | if (request_irq(IM_IRQ_FW, interrupt_handler, IRQF_SHARED, "ibmmcascsi", hosts)) |
1700 | printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW); | 1700 | printk(KERN_ERR "IBM MCA SCSI: Unable to get shared IRQ %d.\n", IM_IRQ_FW); |
1701 | else | 1701 | else |
1702 | IRQ11_registered++; | 1702 | IRQ11_registered++; |