From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Opdenacker Subject: [PATCH] [RESEND] [SCSI] aha152x: remove deprecated IRQF_DISABLED Date: Wed, 5 Mar 2014 06:16:10 +0100 Message-ID: <1393996570-3604-1-git-send-email-michael.opdenacker@free-electrons.com> References: <1386582781-4882-1-git-send-email-michael.opdenacker@free-electrons.com> Return-path: In-Reply-To: <1386582781-4882-1-git-send-email-michael.opdenacker@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org To: fischer@norbit.de, JBottomley@parallels.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Opdenacker List-Id: linux-scsi@vger.kernel.org This patch removes the use of the IRQF_DISABLED flag from drivers/scsi/aha152x.c It's a NOOP since 2.6.35 and it will be removed one day. Also taking the opportunity to fix checkpatch issues on the lines I modified Signed-off-by: Michael Opdenacker --- drivers/scsi/aha152x.c | 4 ++-- 1 file 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) SETPORT(SIMODE0, 0); SETPORT(SIMODE1, 0); - if( request_irq(shpnt->irq, swintr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) { + if (request_irq(shpnt->irq, swintr, IRQF_SHARED, "aha152x", shpnt)) { printk(KERN_ERR "aha152x%d: irq %d busy.\n", shpnt->host_no, shpnt->irq); goto out_host_put; } @@ -891,7 +891,7 @@ struct Scsi_Host *aha152x_probe_one(struct aha152x_setup *setup) SETPORT(SSTAT0, 0x7f); SETPORT(SSTAT1, 0xef); - if ( request_irq(shpnt->irq, intr, IRQF_DISABLED|IRQF_SHARED, "aha152x", shpnt) ) { + if (request_irq(shpnt->irq, intr, IRQF_SHARED, "aha152x", shpnt)) { printk(KERN_ERR "aha152x%d: failed to reassign irq %d.\n", shpnt->host_no, shpnt->irq); goto out_host_put; } -- 1.8.3.2