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

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
...@@ -2848,7 +2848,6 @@ static int ravb_wol_restore(struct net_device *ndev) ...@@ -2848,7 +2848,6 @@ static int ravb_wol_restore(struct net_device *ndev)
{ {
struct ravb_private *priv = netdev_priv(ndev); struct ravb_private *priv = netdev_priv(ndev);
const struct ravb_hw_info *info = priv->info; const struct ravb_hw_info *info = priv->info;
int ret;
if (info->nc_queues) if (info->nc_queues)
napi_enable(&priv->napi[RAVB_NC]); napi_enable(&priv->napi[RAVB_NC]);
...@@ -2857,9 +2856,7 @@ static int ravb_wol_restore(struct net_device *ndev) ...@@ -2857,9 +2856,7 @@ static int ravb_wol_restore(struct net_device *ndev)
/* Disable MagicPacket */ /* Disable MagicPacket */
ravb_modify(ndev, ECMR, ECMR_MPDE, 0); ravb_modify(ndev, ECMR, ECMR_MPDE, 0);
ret = ravb_close(ndev); ravb_close(ndev);
if (ret < 0)
return ret;
return disable_irq_wake(priv->emac_irq); return disable_irq_wake(priv->emac_irq);
} }
......
...@@ -3444,9 +3444,7 @@ static int sh_eth_wol_restore(struct net_device *ndev) ...@@ -3444,9 +3444,7 @@ static int sh_eth_wol_restore(struct net_device *ndev)
* both be reset and all registers restored. This is what * both be reset and all registers restored. This is what
* happens during suspend and resume without WoL enabled. * happens during suspend and resume without WoL enabled.
*/ */
ret = sh_eth_close(ndev); sh_eth_close(ndev);
if (ret < 0)
return ret;
ret = sh_eth_open(ndev); ret = sh_eth_open(ndev);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment