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

Commit 4909cc2b authored by Michael Opdenacker's avatar Michael Opdenacker Committed by James Bottomley
Browse files

[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: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent aa803370

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, 
	NCR5380_setup(instance);



	for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1)

		if ((mask & possible) && (request_irq(i, &probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0))

		if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0))

			trying_irqs |= mask;



	timeout = jiffies + (250 * HZ / 1000);

drivers/scsi/aacraid/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ int _aac_rx_init(struct aac_dev *dev) 
	dev->sync_mode = 0;	/* sync. mode not supported */

	dev->msi = aac_msi && !pci_enable_msi(dev->pdev);

	if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,

			IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {

			IRQF_SHARED, "aacraid", dev) < 0) {

		if (dev->msi)

			pci_disable_msi(dev->pdev);

		printk(KERN_ERR "%s%d: Interrupt unavailable.\n",

drivers/scsi/aacraid/sa.c

+1 −2
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ int aac_sa_init(struct aac_dev *dev) 
		goto error_irq;

	dev->sync_mode = 0;	/* sync. mode not supported */

	if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,

			IRQF_SHARED|IRQF_DISABLED,

			"aacraid", (void *)dev ) < 0) {

			IRQF_SHARED, "aacraid", (void *)dev) < 0) {

		printk(KERN_WARNING "%s%d: Interrupt unavailable.\n",

			name, instance);

		goto error_iounmap;

drivers/scsi/aacraid/src.c

+2 −2
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ int aac_src_init(struct aac_dev *dev) 
	dev->msi = aac_msi && !pci_enable_msi(dev->pdev);



	if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,

			IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {

			IRQF_SHARED, "aacraid", dev) < 0) {



		if (dev->msi)

			pci_disable_msi(dev->pdev);
@@ -804,7 +804,7 @@ int aac_srcv_init(struct aac_dev *dev) 
		goto error_iounmap;

	dev->msi = aac_msi && !pci_enable_msi(dev->pdev);

	if (request_irq(dev->pdev->irq, dev->a_ops.adapter_intr,

		IRQF_SHARED|IRQF_DISABLED, "aacraid", dev) < 0) {

		IRQF_SHARED, "aacraid", dev) < 0) {

		if (dev->msi)

			pci_disable_msi(dev->pdev);

		printk(KERN_ERR "%s%d: Interrupt unavailable.\n",

drivers/scsi/aha152x.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}