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

Commit 1d6f359a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: scsi: Use the new IRQF_ constants 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5d8c8a2e

drivers/scsi/3w-9xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id 
				     TW_PARAM_PORTCOUNT, TW_PARAM_PORTCOUNT_LENGTH)));



	/* Now setup the interrupt handler */

	retval = request_irq(pdev->irq, twa_interrupt, SA_SHIRQ, "3w-9xxx", tw_dev);

	retval = request_irq(pdev->irq, twa_interrupt, IRQF_SHARED, "3w-9xxx", tw_dev);

	if (retval) {

		TW_PRINTK(tw_dev->host, TW_DRIVER, 0x30, "Error requesting IRQ");

		goto out_remove_host;

drivers/scsi/3w-xxxx.c

+1 −1
Original line number Diff line number Diff line
@@ -2397,7 +2397,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id * 
	printk(KERN_WARNING "3w-xxxx: scsi%d: Found a 3ware Storage Controller at 0x%x, IRQ: %d.\n", host->host_no, tw_dev->base_addr, pdev->irq);



	/* Now setup the interrupt handler */

	retval = request_irq(pdev->irq, tw_interrupt, SA_SHIRQ, "3w-xxxx", tw_dev);

	retval = request_irq(pdev->irq, tw_interrupt, IRQF_SHARED, "3w-xxxx", tw_dev);

	if (retval) {

		printk(KERN_WARNING "3w-xxxx: Error requesting IRQ.");

		goto out_remove_host;

drivers/scsi/53c7xx.c

+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ NCR53c7x0_init (struct Scsi_Host *host) { 


    NCR53c7x0_driver_init (host);



    if (request_irq(host->irq, NCR53c7x0_intr, SA_SHIRQ, "53c7xx", host))

    if (request_irq(host->irq, NCR53c7x0_intr, IRQF_SHARED, "53c7xx", host))

    {

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

		host->host_no, host->irq);
@@ -4232,7 +4232,7 @@ restart: 
 * Purpose : handle NCR53c7x0 interrupts for all NCR devices sharing

 *	the same IRQ line.  

 * 

 * Inputs : Since we're using the SA_INTERRUPT interrupt handler

 * Inputs : Since we're using the IRQF_DISABLED interrupt handler

 *	semantics, irq indicates the interrupt which invoked 

 *	this handler.  

 *

drivers/scsi/BusLogic.c

+1 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ static boolean __init BusLogic_AcquireResources(struct BusLogic_HostAdapter *Hos 
	/*

	   Acquire shared access to the IRQ Channel.

	 */

	if (request_irq(HostAdapter->IRQ_Channel, BusLogic_InterruptHandler, SA_SHIRQ, HostAdapter->FullModelName, HostAdapter) < 0) {

	if (request_irq(HostAdapter->IRQ_Channel, BusLogic_InterruptHandler, IRQF_SHARED, HostAdapter->FullModelName, HostAdapter) < 0) {

		BusLogic_Error("UNABLE TO ACQUIRE IRQ CHANNEL %d - DETACHING\n", HostAdapter, HostAdapter->IRQ_Channel);

		return false;

	}

drivers/scsi/NCR5380.c

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



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

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

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

			trying_irqs |= mask;



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