Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83b3f64d authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Russell King
Browse files

ARM: 8004/1: [SCSI]: remove deprecated IRQF_DISABLED 



This patch removes the use of the IRQF_DISABLED flag
from drivers/scsi/arm

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2ed71e75

drivers/scsi/arm/acornscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -2971,7 +2971,7 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id) 
	ec->irqaddr	= ashost->fast + INT_REG;

	ec->irqmask	= 0x0a;



	ret = request_irq(host->irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost);

	ret = request_irq(host->irq, acornscsi_intr, 0, "acornscsi", ashost);

	if (ret) {

		printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n",

			host->host_no, ashost->scsi.irq, ret);

drivers/scsi/arm/cumana_1.c

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int cumanascsi1_probe(struct expansion_card *ec, 
		goto out_unmap;

	}



	ret = request_irq(host->irq, cumanascsi_intr, IRQF_DISABLED,

	ret = request_irq(host->irq, cumanascsi_intr, 0,

			  "CumanaSCSI-1", host);

	if (ret) {

		printk("scsi%d: IRQ%d not free: %d\n",

drivers/scsi/arm/cumana_2.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static int cumanascsi2_probe(struct expansion_card *ec, 
		goto out_free;



	ret = request_irq(ec->irq, cumanascsi_2_intr,

			  IRQF_DISABLED, "cumanascsi2", info);

			  0, "cumanascsi2", info);

	if (ret) {

		printk("scsi%d: IRQ%d not free: %d\n",

		       host->host_no, ec->irq, ret);

drivers/scsi/arm/powertec.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int powertecscsi_probe(struct expansion_card *ec, 
		goto out_free;



	ret = request_irq(ec->irq, powertecscsi_intr,

			  IRQF_DISABLED, "powertec", info);

			  0, "powertec", info);

	if (ret) {

		printk("scsi%d: IRQ%d not free: %d\n",

		       host->host_no, ec->irq, ret);