From: Frederik Deweerdt <deweerdt@free.fr>
To: linux-kernel@vger.kernel.org
Cc: arjan@infradead.org, matthew@wil.cx, alan@lxorguk.ukuu.org.uk,
jeff@garzik.org, akpm@osdl.org, rdunlap@xenotime.net,
gregkh@suse.de
Subject: [RFC PATCH] move tg3 to pci_request_irq
Date: Tue, 3 Oct 2006 22:22:23 +0000 [thread overview]
Message-ID: <20061003222223.GH2785@slug> (raw)
In-Reply-To: <20061003220732.GE2785@slug>
Hi,
This proof-of-concept patch converts the tg3 driver to use the
pci_request_irq() function.
Please note that I'm not submitting the driver changes, they're there
only for illustration purposes. I'll CC the appropriate maintainers
when/if an API is agreed upon.
Regards,
Frederik
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c25ba27..23660c6 100644
Index: 2.6.18-mm3/drivers/net/tg3.c
===================================================================
--- 2.6.18-mm3.orig/drivers/net/tg3.c
+++ 2.6.18-mm3/drivers/net/tg3.c
@@ -6853,7 +6853,7 @@ static int tg3_request_irq(struct tg3 *t
fn = tg3_interrupt_tagged;
flags = IRQF_SHARED | IRQF_SAMPLE_RANDOM;
}
- return (request_irq(tp->pdev->irq, fn, flags, dev->name, dev));
+ return pci_request_irq(tp->pdev, fn, flags, dev->name);
}
static int tg3_test_interrupt(struct tg3 *tp)
@@ -6866,10 +6866,10 @@ static int tg3_test_interrupt(struct tg3
tg3_disable_ints(tp);
- free_irq(tp->pdev->irq, dev);
+ pci_free_irq(tp->pdev);
- err = request_irq(tp->pdev->irq, tg3_test_isr,
- IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name, dev);
+ err = pci_request_irq(tp->pdev, tg3_test_isr,
+ IRQF_SHARED | IRQF_SAMPLE_RANDOM, dev->name);
if (err)
return err;
@@ -6897,7 +6897,7 @@ static int tg3_test_interrupt(struct tg3
tg3_disable_ints(tp);
- free_irq(tp->pdev->irq, dev);
+ pci_free_irq(tp->pdev);
err = tg3_request_irq(tp);
@@ -6915,7 +6915,6 @@ static int tg3_test_interrupt(struct tg3
*/
static int tg3_test_msi(struct tg3 *tp)
{
- struct net_device *dev = tp->dev;
int err;
u16 pci_cmd;
@@ -6946,7 +6945,7 @@ static int tg3_test_msi(struct tg3 *tp)
"the PCI maintainer and include system chipset information.\n",
tp->dev->name);
- free_irq(tp->pdev->irq, dev);
+ pci_free_irq(tp->pdev);
pci_disable_msi(tp->pdev);
tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
@@ -6966,7 +6965,7 @@ static int tg3_test_msi(struct tg3 *tp)
tg3_full_unlock(tp);
if (err)
- free_irq(tp->pdev->irq, dev);
+ pci_free_irq(tp->pdev);
return err;
}
@@ -7051,7 +7050,7 @@ static int tg3_open(struct net_device *d
tg3_full_unlock(tp);
if (err) {
- free_irq(tp->pdev->irq, dev);
+ pci_free_irq(tp->pdev);
if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
pci_disable_msi(tp->pdev);
tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
@@ -7363,7 +7362,7 @@ static int tg3_close(struct net_device *
tg3_full_unlock(tp);
- free_irq(tp->pdev->irq, dev);
+ pci_free_irq(tp->pdev);
if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) {
pci_disable_msi(tp->pdev);
tp->tg3_flags2 &= ~TG3_FLG2_USING_MSI;
next prev parent reply other threads:[~2006-10-03 22:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-03 22:07 [RFC PATCH] add pci_{request,free}_irq take #2 Frederik Deweerdt
2006-10-03 22:14 ` [RFC PATCH] move aic7xxx to pci_request_irq Frederik Deweerdt
2006-10-03 22:14 ` [RFC PATCH] add pci_{request,free}_irq take #2 Jeff Garzik
2006-10-03 22:29 ` Frederik Deweerdt
2006-10-03 22:37 ` Jeff Garzik
2006-10-04 2:59 ` Matthew Wilcox
2006-10-03 22:19 ` [RFC PATCH] move aic79xx to pci_request_irq Frederik Deweerdt
2006-10-03 22:22 ` Frederik Deweerdt [this message]
2006-10-03 22:37 ` [RFC PATCH] move tg3 " Jeff Garzik
2006-10-03 22:41 ` Frederik Deweerdt
2006-10-04 5:38 ` Jeff Garzik
2006-10-04 6:27 ` David Miller
2006-10-04 9:09 ` Frederik Deweerdt
2006-10-03 22:23 ` [RFC PATCH] move e1000 " Frederik Deweerdt
2006-10-03 22:36 ` Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2006-10-04 19:32 [RFC PATCH] add pci_{request,free}_irq take #3 Frederik Deweerdt
2006-10-04 19:46 ` [RFC PATCH] move tg3 to pci_request_irq Frederik Deweerdt
2006-09-29 17:15 2.6.18-mm2 Alan Cox
2006-09-29 23:50 ` 2.6.18-mm2 Frederik Deweerdt
2006-09-29 23:43 ` 2.6.18-mm2 Alan Cox
2006-09-30 14:09 ` [-mm patch] aic7xxx: check irq validity (was Re: 2.6.18-mm2) Frederik Deweerdt
2006-09-30 23:58 ` Jeff Garzik
2006-10-01 14:28 ` Matthew Wilcox
2006-10-01 19:05 ` Arjan van de Ven
2006-10-01 19:36 ` Matthew Wilcox
2006-10-02 2:12 ` Arjan van de Ven
2006-10-02 20:00 ` [RFC PATCH] pci_request_irq (was [-mm patch] aic7xxx: check irq validity) Frederik Deweerdt
2006-10-02 20:11 ` [RFC PATCH] move tg3 to pci_request_irq Frederik Deweerdt
2006-10-02 18:28 ` Matthew Wilcox
2006-10-02 21:04 ` Frederik Deweerdt
2006-10-03 7:18 ` Arjan van de Ven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061003222223.GH2785@slug \
--to=deweerdt@free.fr \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=arjan@infradead.org \
--cc=gregkh@suse.de \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew@wil.cx \
--cc=rdunlap@xenotime.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox