aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx
diff options
context:
space:
mode:
authorVikas Chaudhary <vikas.chaudhary@qlogic.com>2010-12-03 01:12:03 -0500
committerJames Bottomley <James.Bottomley@suse.de>2010-12-21 13:24:35 -0500
commit3e1350c4dc8900476c4db2066c00f13e9e939817 (patch)
tree6ff6278b71ac83cc4d9fda6ded4bc325860bad57 /drivers/scsi/qla4xxx
parent5f0e385fdafb7d6c8ded6464fa6421c735d96caf (diff)
[SCSI] qla4xxx: Drop use of IRQF_DISABLE
IRQF_DISABLE flag is deprecated and this flag is a NOOP in kernel. Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Signed-off-by: Ravi Anand <ravi.anand@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/qla4xxx')
-rw-r--r--drivers/scsi/qla4xxx/ql4_isr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_isr.c b/drivers/scsi/qla4xxx/ql4_isr.c
index 7c33fd5943d5..5d9575cebff9 100644
--- a/drivers/scsi/qla4xxx/ql4_isr.c
+++ b/drivers/scsi/qla4xxx/ql4_isr.c
@@ -1077,7 +1077,7 @@ try_msi:
1077 ret = pci_enable_msi(ha->pdev); 1077 ret = pci_enable_msi(ha->pdev);
1078 if (!ret) { 1078 if (!ret) {
1079 ret = request_irq(ha->pdev->irq, qla4_8xxx_msi_handler, 1079 ret = request_irq(ha->pdev->irq, qla4_8xxx_msi_handler,
1080 IRQF_DISABLED|IRQF_SHARED, DRIVER_NAME, ha); 1080 IRQF_SHARED, DRIVER_NAME, ha);
1081 if (!ret) { 1081 if (!ret) {
1082 DEBUG2(ql4_printk(KERN_INFO, ha, "MSI: Enabled.\n")); 1082 DEBUG2(ql4_printk(KERN_INFO, ha, "MSI: Enabled.\n"));
1083 set_bit(AF_MSI_ENABLED, &ha->flags); 1083 set_bit(AF_MSI_ENABLED, &ha->flags);
@@ -1095,7 +1095,7 @@ try_msi:
1095try_intx: 1095try_intx:
1096 /* Trying INTx */ 1096 /* Trying INTx */
1097 ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler, 1097 ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
1098 IRQF_DISABLED|IRQF_SHARED, DRIVER_NAME, ha); 1098 IRQF_SHARED, DRIVER_NAME, ha);
1099 if (!ret) { 1099 if (!ret) {
1100 DEBUG2(ql4_printk(KERN_INFO, ha, "INTx: Enabled.\n")); 1100 DEBUG2(ql4_printk(KERN_INFO, ha, "INTx: Enabled.\n"));
1101 set_bit(AF_INTx_ENABLED, &ha->flags); 1101 set_bit(AF_INTx_ENABLED, &ha->flags);