aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/src.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2014-03-05 00:09:41 -0500
committerJames Bottomley <JBottomley@Parallels.com>2014-03-19 18:04:44 -0400
commit4909cc2b89715c2dfd4c466a37cc08b2b3890fed (patch)
treeec1265c77c00c04ba212fbaff3033b9994d97343 /drivers/scsi/aacraid/src.c
parentaa8033705eee0a2f682bd64974ea12e224e8aab5 (diff)
[SCSI] remove deprecated IRQF_DISABLED from SCSI
It's a NOOP since 2.6.35 and it will be removed one day. [jejb: remove from missed arm scsi drivers] Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/aacraid/src.c')
-rw-r--r--drivers/scsi/aacraid/src.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c
index 7e17107643d4..9c65aed26212 100644
--- a/drivers/scsi/aacraid/src.c
+++ b/drivers/scsi/aacraid/src.c
@@ -647,7 +647,7 @@ int aac_src_init(struct aac_dev *dev)
647 dev->msi = aac_msi && !pci_enable_msi(dev->pdev); 647 dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
648 648
649 if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr, 649 if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
650 IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) { 650 IRQF_SHARED, "aacraid", dev) < 0) {
651 651
652 if (dev->msi) 652 if (dev->msi)
653 pci_disable_msi(dev->pdev); 653 pci_disable_msi(dev->pdev);
@@ -804,7 +804,7 @@ int aac_srcv_init(struct aac_dev *dev)
804 goto error_iounmap; 804 goto error_iounmap;
805 dev->msi = aac_msi && !pci_enable_msi(dev->pdev); 805 dev->msi = aac_msi && !pci_enable_msi(dev->pdev);
806 if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr, 806 if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,
807 IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) { 807 IRQF_SHARED, "aacraid", dev) < 0) {
808 if (dev->msi) 808 if (dev->msi)
809 pci_disable_msi(dev->pdev); 809 pci_disable_msi(dev->pdev);
810 printk(KERN_ERR "%s%d: Interrupt unavailable.\n", 810 printk(KERN_ERR "%s%d: Interrupt unavailable.\n",