arm driver net macb
Subsystems (2)
PATCH 1/1 arm driver net macb
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.
drivers/net/macb.c +14 -14
@@ -1165,16 +1242,6 @@ 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;
@@ -1214,13 +1281,23 @@ 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 ) { goto err_out_unregister_netdev; } + 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; + } +platform_set_drvdata (pdev, dev); printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n",
@@ -1233,10 +1310,10 @@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:
@@ -1270,8 +1347,8 @@mdiobus_unregister (bp->mii_bus);kfree (bp->mii_bus->irq);mdiobus_free (bp->mii_bus); -unregister_netdev (dev);free_irq (dev->irq, dev); +unregister_netdev (dev);iounmap (bp->regs);#ifndef CONFIG_ARCH_AT91 clk_disable (bp->hclk);
Le 02/09/2010 22:40, Paul Chavent :
Quoted 7 lines
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_irqfunction after having initialized the name of the device.Signed-off-by Paul Chavent <[email protected]>
[..]
Quoted 12 lines
drivers/net/macb.c +1
-1@@ -1214,13 +1281,23 @@ 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 ) { goto err_out_unregister_netdev; }
drivers/net/macb.c line 1300
Quoted 10 lines
drivers/net/macb.c +10
-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; + } +
The string is modified in register_netdev() so why don't you deal with IRQ just after it? I would have placed the code snippet before macb_mii_init(): what do you think about this?
Best regards,
Signature · 1 line
Nicolas Ferre