| From 42661cefc91b7c4bd8591a4b7810fb6c8de7cc57 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 20 Mar 2014 15:00:35 +0100 |
| Subject: sh_eth: Remove goto statements that jump straight to a return |
| |
| "goto" is well accepted for error paths in the kernel but should not be |
| used unnecessarily. Return the correct value directly instead of using a |
| goto when possible. |
| |
| 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 f738a13d8365b0f824f3f20450b413f55374f175) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 30 +++++++++--------------------- |
| 1 file changed, 9 insertions(+), 21 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 5fc66a52c471..1043bbb30061 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -887,7 +887,7 @@ static int sh_eth_reset(struct net_device *ndev) |
| |
| ret = sh_eth_check_reset(ndev); |
| if (ret) |
| - goto out; |
| + return ret; |
| |
| /* Table Init */ |
| sh_eth_write(ndev, 0x0, TDLAR); |
| @@ -914,7 +914,6 @@ static int sh_eth_reset(struct net_device *ndev) |
| EDMR); |
| } |
| |
| -out: |
| return ret; |
| } |
| |
| @@ -1278,7 +1277,7 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start) |
| /* Soft Reset */ |
| ret = sh_eth_reset(ndev); |
| if (ret) |
| - goto out; |
| + return ret; |
| |
| if (mdp->cd->rmiimode) |
| sh_eth_write(ndev, 0x1, RMIIMODE); |
| @@ -1357,7 +1356,6 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start) |
| netif_start_queue(ndev); |
| } |
| |
| -out: |
| return ret; |
| } |
| |
| @@ -2619,10 +2617,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp, |
| |
| /* create bit control struct for PHY */ |
| bitbang = devm_kzalloc(dev, sizeof(struct bb_info), GFP_KERNEL); |
| - if (!bitbang) { |
| - ret = -ENOMEM; |
| - goto out; |
| - } |
| + if (!bitbang) |
| + return -ENOMEM; |
| |
| /* bitbang init */ |
| bitbang->addr = mdp->addr + mdp->reg_offset[PIR]; |
| @@ -2635,10 +2631,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp, |
| |
| /* MII controller setting */ |
| mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl); |
| - if (!mdp->mii_bus) { |
| - ret = -ENOMEM; |
| - goto out; |
| - } |
| + if (!mdp->mii_bus) |
| + return -ENOMEM; |
| |
| /* Hook up MII support for ethtool */ |
| mdp->mii_bus->name = "sh_mii"; |
| @@ -2673,8 +2667,6 @@ static int sh_mdio_init(struct sh_eth_private *mdp, |
| |
| out_free_bus: |
| free_mdio_bitbang(mdp->mii_bus); |
| - |
| -out: |
| return ret; |
| } |
| |
| @@ -2787,15 +2779,12 @@ static int sh_eth_drv_probe(struct platform_device *pdev) |
| res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| if (unlikely(res == NULL)) { |
| dev_err(&pdev->dev, "invalid resource\n"); |
| - ret = -EINVAL; |
| - goto out; |
| + return -EINVAL; |
| } |
| |
| ndev = alloc_etherdev(sizeof(struct sh_eth_private)); |
| - if (!ndev) { |
| - ret = -ENOMEM; |
| - goto out; |
| - } |
| + if (!ndev) |
| + return -ENOMEM; |
| |
| /* The sh Ether-specific entries in the device structure. */ |
| ndev->base_addr = res->start; |
| @@ -2936,7 +2925,6 @@ out_release: |
| if (ndev) |
| free_netdev(ndev); |
| |
| -out: |
| return ret; |
| } |
| |
| -- |
| 2.1.2 |
| |