summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aha152x.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/aha152x.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/aha152x.c')
-rw-r--r--drivers/scsi/aha152x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index 3f7b6fee0a74..e86eb6a921fc 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -857,7 +857,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
857 SETPORT(SIMODE0, 0); 857 SETPORT(SIMODE0, 0);
858 SETPORT(SIMODE1, 0); 858 SETPORT(SIMODE1, 0);
859 859
860 if( request_irq(shpnt->irq, swintr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) { 860 if (request_irq(shpnt->irq, swintr, IRQF_SHARED, "aha152x", shpnt)) {
861 printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt->host_no, shpnt->irq); 861 printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt->host_no, shpnt->irq);
862 goto out_host_put; 862 goto out_host_put;
863 } 863 }
@@ -891,7 +891,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup)
891 SETPORT(SSTAT0, 0x7f); 891 SETPORT(SSTAT0, 0x7f);
892 SETPORT(SSTAT1, 0xef); 892 SETPORT(SSTAT1, 0xef);
893 893
894 if ( request_irq(shpnt->irq, intr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) { 894 if (request_irq(shpnt->irq, intr, IRQF_SHARED, "aha152x", shpnt)) {
895 printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt->host_no, shpnt->irq); 895 printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt->host_no, shpnt->irq);
896 goto out_host_put; 896 goto out_host_put;
897 } 897 }