Skip to content

Commit 83b3f64

Browse files
Michael OpdenackerRussell King
Michael Opdenacker
authored and
Russell King
committed
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: Michael Opdenacker <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 2ed71e7 commit 83b3f64

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/scsi/arm/acornscsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2971,7 +2971,7 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
29712971
ec->irqaddr = ashost->fast + INT_REG;
29722972
ec->irqmask = 0x0a;
29732973

2974-
ret = request_irq(host->irq, acornscsi_intr, IRQF_DISABLED, "acornscsi", ashost);
2974+
ret = request_irq(host->irq, acornscsi_intr, 0, "acornscsi", ashost);
29752975
if (ret) {
29762976
printk(KERN_CRIT "scsi%d: IRQ%d not free: %d\n",
29772977
host->host_no, ashost->scsi.irq, ret);

drivers/scsi/arm/cumana_1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ static int cumanascsi1_probe(struct expansion_card *ec,
262262
goto out_unmap;
263263
}
264264

265-
ret = request_irq(host->irq, cumanascsi_intr, IRQF_DISABLED,
265+
ret = request_irq(host->irq, cumanascsi_intr, 0,
266266
"CumanaSCSI-1", host);
267267
if (ret) {
268268
printk("scsi%d: IRQ%d not free: %d\n",

drivers/scsi/arm/cumana_2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ static int cumanascsi2_probe(struct expansion_card *ec,
431431
goto out_free;
432432

433433
ret = request_irq(ec->irq, cumanascsi_2_intr,
434-
IRQF_DISABLED, "cumanascsi2", info);
434+
0, "cumanascsi2", info);
435435
if (ret) {
436436
printk("scsi%d: IRQ%d not free: %d\n",
437437
host->host_no, ec->irq, ret);

drivers/scsi/arm/powertec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ static int powertecscsi_probe(struct expansion_card *ec,
358358
goto out_free;
359359

360360
ret = request_irq(ec->irq, powertecscsi_intr,
361-
IRQF_DISABLED, "powertec", info);
361+
0, "powertec", info);
362362
if (ret) {
363363
printk("scsi%d: IRQ%d not free: %d\n",
364364
host->host_no, ec->irq, ret);

0 commit comments

Comments
 (0)