Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f738a13d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by David S. Miller
Browse files

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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent daacf03f

drivers/net/ethernet/renesas/sh_eth.c

+9 −21
Original line number Diff line number Diff line
@@ -873,7 +873,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);
@@ -900,7 +900,6 @@ static int sh_eth_reset(struct net_device *ndev) 
			     EDMR);

	}



out:

	return ret;

}
@@ -1264,7 +1263,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);
@@ -1343,7 +1342,6 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start) 
		netif_start_queue(ndev);

	}



out:

	return ret;

}
@@ -2605,10 +2603,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];
@@ -2621,10 +2617,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";
@@ -2659,8 +2653,6 @@ static int sh_mdio_init(struct sh_eth_private *mdp, 


out_free_bus:

	free_mdio_bitbang(mdp->mii_bus);



out:

	return ret;

}
@@ -2773,15 +2765,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;
@@ -2922,7 +2911,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) 
	if (ndev)

		free_netdev(ndev);



out:

	return ret;

}