* [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled
@ 2011-02-09 12:43 Jean-Christophe PLAGNIOL-VILLARD
2011-02-09 13:41 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-02-09 12:43 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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:
--
1.7.2.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled
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
2011-02-09 14:44 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2011-02-09 13:41 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled
2011-02-09 13:41 ` Sergei Shtylyov
@ 2011-02-09 14:44 ` Jean-Christophe PLAGNIOL-VILLARD
2011-02-10 13:58 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-02-09 14:44 UTC (permalink / raw)
To: linux-arm-kernel
On 16:41 Wed 09 Feb , Sergei Shtylyov wrote:
> 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...
request_irq will fail too so do we really need to check it?
>
> >+ err = request_irq(dev->irq, macb_interrupt, IRQF_SAMPLE_RANDOM,
> >+ dev->name, dev);
Best Regards,
J.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled
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
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2011-02-10 13:58 UTC (permalink / raw)
To: linux-arm-kernel
Hello.
On 09-02-2011 17:44, 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...
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled
2011-02-10 13:58 ` Sergei Shtylyov
@ 2011-02-12 14:30 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-02-12 14:30 UTC (permalink / raw)
To: linux-arm-kernel
On 16:58 Thu 10 Feb , Sergei Shtylyov wrote:
> Hello.
>
> On 09-02-2011 17:44, 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...
>
> >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.
yes it's
Best Regards,
J.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-02-12 14:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).