diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 2 | ||||
-rw-r--r-- | drivers/scsi/arcmsr/arcmsr_hba.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvstgt.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index bc7744e35ad0..27852b43b904 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -653,7 +653,7 @@ static int __devinit asd_pci_probe(struct pci_dev *dev, | |||
653 | if (use_msi) | 653 | if (use_msi) |
654 | pci_enable_msi(asd_ha->pcidev); | 654 | pci_enable_msi(asd_ha->pcidev); |
655 | 655 | ||
656 | err = request_irq(asd_ha->pcidev->irq, asd_hw_isr, SA_SHIRQ, | 656 | err = request_irq(asd_ha->pcidev->irq, asd_hw_isr, IRQF_SHARED, |
657 | ASD_DRIVER_NAME, asd_ha); | 657 | ASD_DRIVER_NAME, asd_ha); |
658 | if (err) { | 658 | if (err) { |
659 | asd_printk("couldn't get irq %d for %s\n", | 659 | asd_printk("couldn't get irq %d for %s\n", |
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 086cc97eee8c..8b46158cc045 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c | |||
@@ -322,7 +322,7 @@ static int arcmsr_probe(struct pci_dev *pdev, | |||
322 | goto out_iounmap; | 322 | goto out_iounmap; |
323 | 323 | ||
324 | error = request_irq(pdev->irq, arcmsr_do_interrupt, | 324 | error = request_irq(pdev->irq, arcmsr_do_interrupt, |
325 | SA_INTERRUPT | SA_SHIRQ, "arcmsr", acb); | 325 | IRQF_DISABLED | IRQF_SHARED, "arcmsr", acb); |
326 | if (error) | 326 | if (error) |
327 | goto out_free_ccb_pool; | 327 | goto out_free_ccb_pool; |
328 | 328 | ||
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c index e28260f05d6b..4368ca0e8270 100644 --- a/drivers/scsi/ibmvscsi/ibmvstgt.c +++ b/drivers/scsi/ibmvscsi/ibmvstgt.c | |||
@@ -580,7 +580,7 @@ static int crq_queue_create(struct crq_queue *queue, struct srp_target *target) | |||
580 | } | 580 | } |
581 | 581 | ||
582 | err = request_irq(vport->dma_dev->irq, &ibmvstgt_interrupt, | 582 | err = request_irq(vport->dma_dev->irq, &ibmvstgt_interrupt, |
583 | SA_INTERRUPT, "ibmvstgt", target); | 583 | IRQF_DISABLED, "ibmvstgt", target); |
584 | if (err) | 584 | if (err) |
585 | goto req_irq_failed; | 585 | goto req_irq_failed; |
586 | 586 | ||
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 81fb7bd44f01..0bfddf893ed0 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
@@ -1270,7 +1270,7 @@ static int __devinit qla4xxx_probe_adapter(struct pci_dev *pdev, | |||
1270 | INIT_WORK(&ha->dpc_work, qla4xxx_do_dpc); | 1270 | INIT_WORK(&ha->dpc_work, qla4xxx_do_dpc); |
1271 | 1271 | ||
1272 | ret = request_irq(pdev->irq, qla4xxx_intr_handler, | 1272 | ret = request_irq(pdev->irq, qla4xxx_intr_handler, |
1273 | SA_INTERRUPT|SA_SHIRQ, "qla4xxx", ha); | 1273 | IRQF_DISABLED | IRQF_SHARED, "qla4xxx", ha); |
1274 | if (ret) { | 1274 | if (ret) { |
1275 | dev_warn(&ha->pdev->dev, "Failed to reserve interrupt %d" | 1275 | dev_warn(&ha->pdev->dev, "Failed to reserve interrupt %d" |
1276 | " already in use.\n", pdev->irq); | 1276 | " already in use.\n", pdev->irq); |