mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
[PATCH] irq-flags: firewire: 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: Jody McIntyre <scjody@modernduck.com> Cc: Ben Collins <bcollins@debian.org> Cc: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
362537b9ab
commit
272ee69c65
2 changed files with 3 additions and 3 deletions
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue