Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750951AbWJDTq0 (ORCPT ); Wed, 4 Oct 2006 15:46:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750952AbWJDTq0 (ORCPT ); Wed, 4 Oct 2006 15:46:26 -0400 Received: from ug-out-1314.google.com ([66.249.92.169]:41522 "EHLO ug-out-1314.google.com") by vger.kernel.org with ESMTP id S1750949AbWJDTqZ (ORCPT ); Wed, 4 Oct 2006 15:46:25 -0400 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent:sender; b=fUsyzNVr0OTJhKpDvl5mc3C2hylDNF5fdZaolxoN5D3ldM15dRtskDp9OwaEwl4+YQlEd4kblBU24teele9rDXs2hOj2DXY+TGuxdIogiOD2OV1cJgZ0nMuZBKsLDX2+76Cek7RB9a5IdpKAaC+S86h7BQN0CEbsYV29B7NeYr0= Date: Wed, 4 Oct 2006 19:46:02 +0000 From: Frederik Deweerdt 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 Message-ID: <20061004194602.GD352@slug> References: <20061004193229.GA352@slug> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061004193229.GA352@slug> User-Agent: mutt-ng/devel-r804 (Linux) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3349 Lines: 118 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 drivers/net/tg3.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) 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 @@ -6839,21 +6839,18 @@ restart_timer: static int tg3_request_irq(struct tg3 *tp) { irqreturn_t (*fn)(int, void *, struct pt_regs *); - unsigned long flags; struct net_device *dev = tp->dev; if (tp->tg3_flags2 & TG3_FLG2_USING_MSI) { fn = tg3_msi; if (tp->tg3_flags2 & TG3_FLG2_1SHOT_MSI) fn = tg3_msi_1shot; - flags = IRQF_SAMPLE_RANDOM; } else { fn = tg3_interrupt; if (tp->tg3_flags & TG3_FLAG_TAGGED_STATUS) 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, IRQF_SAMPLE_RANDOM, dev->name); } static int tg3_test_interrupt(struct tg3 *tp) @@ -6866,10 +6863,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_SAMPLE_RANDOM, dev->name); if (err) return err; @@ -6897,7 +6894,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 +6912,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 +6942,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 +6962,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 +7047,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 +7359,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; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/