From: Sergei Shtylyov <sshtylyov@mvista•com>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft•com>
Cc: linux-arm-kernel@lists•infradead.org, netdev@vger•kernel.org,
Nicolas Ferre <nicolas.ferre@atmel•com>,
Paul Chavent <paul.chavent@fnac•net>
Subject: Re: [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled
Date: Wed, 09 Feb 2011 16:41:38 +0300 [thread overview]
Message-ID: <4D529992.7050502@ru.mvista.com> (raw)
In-Reply-To: <1297255416-6920-1-git-send-email-plagnioj@jcrosoft.com>
Hello.
On 09-02-2011 15:43, Jean-Christophe PLAGNIOL-VILLARD wrote:
> From: Paul Chavent<paul.chavent@fnac•net>
> 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<paul.chavent@fnac•net>
> Signed-off-by: Nicolas Ferre<nicolas.ferre@atmel•com>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD<plagnioj@jcrosoft•com>
[...]
> 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...
> + 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;
> + }
{} not needed here. I think checkpatch.pl should notice this.
WBR, Sergei
next prev parent reply other threads:[~2011-02-09 13:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-09 12:43 [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled Jean-Christophe PLAGNIOL-VILLARD
2011-02-09 13:41 ` Sergei Shtylyov [this message]
2011-02-09 14:44 ` Jean-Christophe PLAGNIOL-VILLARD
2011-02-10 13:58 ` Sergei Shtylyov
2011-02-12 14:30 ` Jean-Christophe PLAGNIOL-VILLARD
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=4D529992.7050502@ru.mvista.com \
--to=sshtylyov@mvista$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nicolas.ferre@atmel$(echo .)com \
--cc=paul.chavent@fnac$(echo .)net \
--cc=plagnioj@jcrosoft$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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