From mboxrd@z Thu Jan 1 00:00:00 1970 From: sshtylyov@mvista.com (Sergei Shtylyov) Date: Thu, 10 Feb 2011 16:58:18 +0300 Subject: [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled In-Reply-To: <20110209144411.GB11255@game.jcrosoft.org> References: <1297255416-6920-1-git-send-email-plagnioj@jcrosoft.com> <4D529992.7050502@ru.mvista.com> <20110209144411.GB11255@game.jcrosoft.org> Message-ID: <4D53EEFA.3030801@ru.mvista.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hello. On 09-02-2011 17:44, Jean-Christophe PLAGNIOL-VILLARD wrote: >>> 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 >> [...] >>> 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 >> [...] >>> @@ -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); >> platform_get_irq() can fail... > request_irq will fail too so do we really need to check it? You then will get the following printed: macb: Unable to request IRQ -6 (error -22) If this is acceptable, then platfrom_get_irq()'s result can be ignored indeed. >>> + err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM, >>> + dev->name, dev); > Best Regards, > J. WBR, Sergei From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled Date: Thu, 10 Feb 2011 16:58:18 +0300 Message-ID: <4D53EEFA.3030801@ru.mvista.com> References: <1297255416-6920-1-git-send-email-plagnioj@jcrosoft.com> <4D529992.7050502@ru.mvista.com> <20110209144411.GB11255@game.jcrosoft.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Sergei Shtylyov , linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, Nicolas Ferre , Paul Chavent To: Jean-Christophe PLAGNIOL-VILLARD Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:63626 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147Ab1BJN7g (ORCPT ); Thu, 10 Feb 2011 08:59:36 -0500 Received: by bwz15 with SMTP id 15so2131113bwz.19 for ; Thu, 10 Feb 2011 05:59:35 -0800 (PST) In-Reply-To: <20110209144411.GB11255@game.jcrosoft.org> Sender: netdev-owner@vger.kernel.org List-ID: Hello. On 09-02-2011 17:44, Jean-Christophe PLAGNIOL-VILLARD wrote: >>> 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 >> [...] >>> 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 >> [...] >>> @@ -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); >> platform_get_irq() can fail... > request_irq will fail too so do we really need to check it? You then will get the following printed: macb: Unable to request IRQ -6 (error -22) If this is acceptable, then platfrom_get_irq()'s result can be ignored indeed. >>> + err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM, >>> + dev->name, dev); > Best Regards, > J. WBR, Sergei