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

Commit 272ee69c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] irq-flags: firewire: 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: Jody McIntyre <scjody@modernduck.com>
Cc: Ben Collins <bcollins@debian.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 362537b9

drivers/ieee1394/ohci1394.c

+2 −2
Original line number Diff line number Diff line
@@ -3392,12 +3392,12 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, 
	spin_lock_init(&ohci->event_lock);



	/*

	 * interrupts are disabled, all right, but... due to SA_SHIRQ we

	 * interrupts are disabled, all right, but... due to IRQF_SHARED we

	 * might get called anyway.  We'll see no event, of course, but

	 * we need to get to that "no event", so enough should be initialized

	 * by that point.

	 */

	if (request_irq(dev->irq, ohci_irq_handler, SA_SHIRQ,

	if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED,

			 OHCI1394_DRIVER_NAME, ohci))

		FAIL(-ENOMEM, "Failed to allocate shared interrupt %d", dev->irq);

drivers/ieee1394/pcilynx.c

+1 −1
Original line number Diff line number Diff line
@@ -1253,7 +1253,7 @@ static int __devinit add_card(struct pci_dev *dev, 


	sprintf (irq_buf, "%d", dev->irq);



        if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ,

        if (!request_irq(dev->irq, lynx_irq_handler, IRQF_SHARED,

                         PCILYNX_DRIVER_NAME, lynx)) {

                PRINT(KERN_INFO, lynx->id, "allocated interrupt %s", irq_buf);

                lynx->state = have_intr;