[PATCH 1/2] atmel/macb: fix device name when SOFT/HARD_IRQ enabled

[Sergei Shtylyov]

Hello.

On 09-02-2011 17:44, Jean-Christophe PLAGNIOL-VILLARD wrote:

>>> From: Paul Chavent<paul.chavent at 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 at fnac.net>
>>> Signed-off-by: Nicolas Ferre<nicolas.ferre at atmel.com>
>>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD<plagnioj at 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