Commit 116ea68d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'renesas-dead-code' 



Sergey Shtylyov says:

====================
Remove some dead code in the Renesas Ethernet drivers

Here are 2 patches against DaveM's 'net-next.git' repo. The Renesas drivers
call their ndo_stop() methods directly and they always return 0, making the
result checks pointless, hence remove them...
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cc4598cf e7d966f9

drivers/net/ethernet/renesas/ravb_main.c

+1 −4
Original line number Diff line number Diff line
@@ -2848,7 +2848,6 @@ static int ravb_wol_restore(struct net_device *ndev) 
{

	struct ravb_private *priv = netdev_priv(ndev);

	const struct ravb_hw_info *info = priv->info;

	int ret;



	if (info->nc_queues)

		napi_enable(&priv->napi[RAVB_NC]);
@@ -2857,9 +2856,7 @@ static int ravb_wol_restore(struct net_device *ndev) 
	/* Disable MagicPacket */

	ravb_modify(ndev, ECMR, ECMR_MPDE, 0);



	ret = ravb_close(ndev);

	if (ret < 0)

		return ret;

	ravb_close(ndev);



	return disable_irq_wake(priv->emac_irq);

}

drivers/net/ethernet/renesas/sh_eth.c

+1 −3
Original line number Diff line number Diff line
@@ -3444,9 +3444,7 @@ static int sh_eth_wol_restore(struct net_device *ndev) 
	 * both be reset and all registers restored. This is what

	 * happens during suspend and resume without WoL enabled.

	 */

	ret = sh_eth_close(ndev);

	if (ret < 0)

		return ret;

	sh_eth_close(ndev);

	ret = sh_eth_open(ndev);

	if (ret < 0)

		return ret;