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

Commit 69ab3912 authored Jul 01, 2006 by Thomas Gleixner Committed by Linus Torvalds Jul 02, 2006

[PATCH] irq-flags: drivers/block Use the new IRQF_ constants



Signed-off-by: Thomas 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: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 3cca53b0

drivers/block/DAC960.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3014,7 +3014,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device,
		Acquire shared access to the IRQ Channel.
		*/
		IRQ_Channel = PCI_Device->irq;
		if (request_irq(IRQ_Channel, InterruptHandler, SA_SHIRQ,
		if (request_irq(IRQ_Channel, InterruptHandler, IRQF_SHARED,
		Controller->FullModelName, Controller) < 0)
		{
		DAC960_Error("Unable to acquire IRQ Channel %d for Controller at\n",

drivers/block/cciss.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3159,7 +3159,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
		/* make sure the board interrupts are off */
		hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
		if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
		SA_INTERRUPT \| SA_SHIRQ, hba[i]->devname, hba[i])) {
		IRQF_DISABLED \| IRQF_SHARED, hba[i]->devname, hba[i])) {
		printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
		hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname);
		goto clean2;

drivers/block/cpqarray.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -408,7 +408,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
		}
		hba[i]->access.set_intr_mask(hba[i], 0);
		if (request_irq(hba[i]->intr, do_ida_intr,
		SA_INTERRUPT\|SA_SHIRQ, hba[i]->devname, hba[i]))
		IRQF_DISABLED\|IRQF_SHARED, hba[i]->devname, hba[i]))
		{
		printk(KERN_ERR "cpqarray: Unable to get irq %d for %s\n",
		hba[i]->intr, hba[i]->devname);

drivers/block/ps2esdi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -340,9 +340,9 @@ static int __init ps2esdi_geninit(void)
		/* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can
		share with the SCSI driver */
		if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
		SA_INTERRUPT \| SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk)
		IRQF_DISABLED \| IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
		&& request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
		SA_SHIRQ, "PS/2 ESDI", &ps2esdi_gendisk)
		IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
		) {
		printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);
		error = -EBUSY;

drivers/block/sx8.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1676,7 +1676,7 @@ static int carm_init_one (struct pci_dev pdev, const struct pci_device_id ent)

		pci_set_master(pdev);

		rc = request_irq(pdev->irq, carm_interrupt, SA_SHIRQ, DRV_NAME, host);
		rc = request_irq(pdev->irq, carm_interrupt, IRQF_SHARED, DRV_NAME, host);
		if (rc) {
		printk(KERN_ERR DRV_NAME "(%s): irq alloc failure\n",
		pci_name(pdev));