| From afc2c0af21e2e8eff5feaedd312d4c7d3f0d6ac4 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 20 Mar 2014 15:00:34 +0100 |
| Subject: sh_eth: Register MDIO bus before registering the network device |
| |
| Network API functions that rely on the MDIO bus can be called as soon as |
| the driver calls register_netdev(). Register the MDIO bus before the |
| network device to avoid race conditions. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit daacf03f0bbfefee3df107c3f7659d22e22538a7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 20 +++++++++----------- |
| 1 file changed, 9 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 7067fdeb5bb3..5fc66a52c471 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -2905,6 +2905,13 @@ static int sh_eth_drv_probe(struct platform_device *pdev) |
| } |
| } |
| |
| + /* MDIO bus init */ |
| + ret = sh_mdio_init(mdp, pd); |
| + if (ret) { |
| + dev_err(&ndev->dev, "failed to initialise MDIO\n"); |
| + goto out_release; |
| + } |
| + |
| netif_napi_add(ndev, &mdp->napi, sh_eth_poll, 64); |
| |
| /* network device register */ |
| @@ -2912,13 +2919,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) |
| if (ret) |
| goto out_napi_del; |
| |
| - /* mdio bus init */ |
| - ret = sh_mdio_init(mdp, pd); |
| - if (ret) { |
| - dev_err(&ndev->dev, "failed to initialise MDIO\n"); |
| - goto out_unregister; |
| - } |
| - |
| /* print device information */ |
| netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", |
| (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); |
| @@ -2927,11 +2927,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev) |
| |
| return ret; |
| |
| -out_unregister: |
| - unregister_netdev(ndev); |
| - |
| out_napi_del: |
| netif_napi_del(&mdp->napi); |
| + sh_mdio_release(mdp); |
| |
| out_release: |
| /* net_dev free */ |
| @@ -2947,9 +2945,9 @@ static int sh_eth_drv_remove(struct platform_device *pdev) |
| struct net_device *ndev = platform_get_drvdata(pdev); |
| struct sh_eth_private *mdp = netdev_priv(ndev); |
| |
| - sh_mdio_release(mdp); |
| unregister_netdev(ndev); |
| netif_napi_del(&mdp->napi); |
| + sh_mdio_release(mdp); |
| pm_runtime_disable(&pdev->dev); |
| free_netdev(ndev); |
| |
| -- |
| 2.1.2 |
| |