diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:50 -0400 |
commit | 272ee69c653d4b4f15049ed956554085d4bdaa44 (patch) | |
tree | 2489aa0a947b0f6cf9d34cd55bea5b268db1d188 /drivers/ieee1394 | |
parent | 362537b9abf02458967fc2bd9aa7cd18e3ef576a (diff) |
[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>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r-- | drivers/ieee1394/ohci1394.c | 4 | ||||
-rw-r--r-- | drivers/ieee1394/pcilynx.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 8de81ecd3ba6..d4bad6704bbe 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c | |||
@@ -3392,12 +3392,12 @@ static int __devinit ohci1394_pci_probe(struct pci_dev *dev, | |||
3392 | spin_lock_init(&ohci->event_lock); | 3392 | spin_lock_init(&ohci->event_lock); |
3393 | 3393 | ||
3394 | /* | 3394 | /* |
3395 | * interrupts are disabled, all right, but... due to SA_SHIRQ we | 3395 | * interrupts are disabled, all right, but... due to IRQF_SHARED we |
3396 | * might get called anyway. We'll see no event, of course, but | 3396 | * might get called anyway. We'll see no event, of course, but |
3397 | * we need to get to that "no event", so enough should be initialized | 3397 | * we need to get to that "no event", so enough should be initialized |
3398 | * by that point. | 3398 | * by that point. |
3399 | */ | 3399 | */ |
3400 | if (request_irq(dev->irq, ohci_irq_handler, SA_SHIRQ, | 3400 | if (request_irq(dev->irq, ohci_irq_handler, IRQF_SHARED, |
3401 | OHCI1394_DRIVER_NAME, ohci)) | 3401 | OHCI1394_DRIVER_NAME, ohci)) |
3402 | FAIL(-ENOMEM, "Failed to allocate shared interrupt %d", dev->irq); | 3402 | FAIL(-ENOMEM, "Failed to allocate shared interrupt %d", dev->irq); |
3403 | 3403 | ||
diff --git a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c index 5b48f6ac5c7f..e6f41238f5e8 100644 --- a/drivers/ieee1394/pcilynx.c +++ b/drivers/ieee1394/pcilynx.c | |||
@@ -1253,7 +1253,7 @@ static int __devinit add_card(struct pci_dev *dev, | |||
1253 | 1253 | ||
1254 | sprintf (irq_buf, "%d", dev->irq); | 1254 | sprintf (irq_buf, "%d", dev->irq); |
1255 | 1255 | ||
1256 | if (!request_irq(dev->irq, lynx_irq_handler, SA_SHIRQ, | 1256 | if (!request_irq(dev->irq, lynx_irq_handler, IRQF_SHARED, |
1257 | PCILYNX_DRIVER_NAME, lynx)) { | 1257 | PCILYNX_DRIVER_NAME, lynx)) { |
1258 | PRINT(KERN_INFO, lynx->id, "allocated interrupt %s", irq_buf); | 1258 | PRINT(KERN_INFO, lynx->id, "allocated interrupt %s", irq_buf); |
1259 | lynx->state = have_intr; | 1259 | lynx->state = have_intr; |