diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:51 -0400 |
commit | 1fb9df5d3069064c037c81c0ab8bf783ffa5e373 (patch) | |
tree | 23028cfd5b98a72fcf12256fac4bc0c68181f2c4 /drivers/net/tg3.c | |
parent | dace145374b8e39aeb920304c358ab5e220341ab (diff) |
[PATCH] irq-flags: drivers/net: 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: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 953255e92633..e5e1b2962936 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -6702,12 +6702,12 @@ static int tg3_request_irq(struct tg3 *tp) | |||
6702 | fn = tg3_msi; | 6702 | fn = tg3_msi; |
6703 | if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI) | 6703 | if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI) |
6704 | fn = tg3_msi_1shot; | 6704 | fn = tg3_msi_1shot; |
6705 | flags = SA_SAMPLE_RANDOM; | 6705 | flags = IRQF_SAMPLE_RANDOM; |
6706 | } else { | 6706 | } else { |
6707 | fn = tg3_interrupt; | 6707 | fn = tg3_interrupt; |
6708 | if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) | 6708 | if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) |
6709 | fn = tg3_interrupt_tagged; | 6709 | fn = tg3_interrupt_tagged; |
6710 | flags = SA_SHIRQ | SA_SAMPLE_RANDOM; | 6710 | flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM; |
6711 | } | 6711 | } |
6712 | return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev)); | 6712 | return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev)); |
6713 | } | 6713 | } |
@@ -6726,7 +6726,7 @@ static int tg3_test_interrupt(struct tg3 *tp) | |||
6726 | free_irq(tp->pdev->irq, dev); | 6726 | free_irq(tp->pdev->irq, dev); |
6727 | 6727 | ||
6728 | err = request_irq(tp->pdev->irq, tg3_test_isr, | 6728 | err = request_irq(tp->pdev->irq, tg3_test_isr, |
6729 | SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev); | 6729 | IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev); |
6730 | if (err) | 6730 | if (err) |
6731 | return err; | 6731 | return err; |
6732 | 6732 | ||