From patchwork Wed Feb 9 12:43:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Christophe PLAGNIOL-VILLARD X-Patchwork-Id: 82455 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3231EB70EC for ; Wed, 9 Feb 2011 23:46:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754557Ab1BIMqm (ORCPT ); Wed, 9 Feb 2011 07:46:42 -0500 Received: from 26.mail-out.ovh.net ([91.121.27.225]:40196 "HELO 26.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752835Ab1BIMql (ORCPT ); Wed, 9 Feb 2011 07:46:41 -0500 Received: (qmail 6966 invoked by uid 503); 9 Feb 2011 12:49:53 -0000 Received: from b9.ovh.net (HELO mail613.ha.ovh.net) (213.186.33.59) by 26.mail-out.ovh.net with SMTP; 9 Feb 2011 12:49:53 -0000 Received: from b0.ovh.net (HELO queueout) (213.186.33.50) by b0.ovh.net with SMTP; 9 Feb 2011 14:46:39 +0200 Received: from ns32433.ovh.net (HELO localhost) (plagnioj%jcrosoft.com@213.251.161.87) by ns0.ovh.net with SMTP; 9 Feb 2011 14:46:37 +0200 From: Jean-Christophe PLAGNIOL-VILLARD To: linux-arm-kernel@lists.infradead.org Cc: netdev@vger.kernel.org, Paul Chavent , Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD Subject: [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled Date: Wed, 9 Feb 2011 13:43:36 +0100 Message-Id: <1297255416-6920-1-git-send-email-plagnioj@jcrosoft.com> X-Mailer: git-send-email 1.7.2.3 X-Ovh-Tracer-Id: 10136758336421997565 X-Ovh-Remote: 213.251.161.87 (ns32433.ovh.net) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-Spam-Check: DONE|U 0.5/N Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Paul Chavent When listing processes on a system with SOFT/HARD_IRQ enabled, the name of the ethernet device is [irq/eth%d] (instead of [irq/eth0] for example). This patch call the request_irq function after having initialized the name of the device. Signed-off-by: Paul Chavent Signed-off-by: Nicolas Ferre Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- drivers/net/macb.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index f69e73e..d642e08 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -1170,16 +1170,6 @@ static int __init macb_probe(struct platform_device *pdev) goto err_out_disable_clocks; } - dev->irq = platform_get_irq(pdev, 0); - err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM, - dev->name, dev); - if (err) { - printk(KERN_ERR - "%s: Unable to request IRQ %d (error %d)\n", - dev->name, dev->irq, err); - goto err_out_iounmap; - } - dev->netdev_ops = &macb_netdev_ops; netif_napi_add(dev, &bp->napi, macb_poll, 64); dev->ethtool_ops = &macb_ethtool_ops; @@ -1219,13 +1209,23 @@ static int __init macb_probe(struct platform_device *pdev) err = register_netdev(dev); if (err) { dev_err(&pdev->dev, "Cannot register net device, aborting.\n"); - goto err_out_free_irq; + goto err_out_iounmap; } - if (macb_mii_init(bp) != 0) { + dev->irq = platform_get_irq(pdev, 0); + err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM, + dev->name, dev); + if (err) { + printk(KERN_ERR + "%s: Unable to request IRQ %d (error %d)\n", + dev->name, dev->irq, err); goto err_out_unregister_netdev; } + if (macb_mii_init(bp) != 0) { + goto err_out_free_irq; + } + platform_set_drvdata(pdev, dev); printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n", @@ -1238,10 +1238,10 @@ static int __init macb_probe(struct platform_device *pdev) return 0; -err_out_unregister_netdev: - unregister_netdev(dev); err_out_free_irq: free_irq(dev->irq, dev); +err_out_unregister_netdev: + unregister_netdev(dev); err_out_iounmap: iounmap(bp->regs); err_out_disable_clocks: