Skip to content

Commit

Permalink
Merge branch 'renesas-dead-code'
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jan 31, 2022
2 parents cc4598c + e7d966f commit 116ea68
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
5 changes: 1 addition & 4 deletions drivers/net/ethernet/renesas/ravb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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);
}
Expand Down
4 changes: 1 addition & 3 deletions drivers/net/ethernet/renesas/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 116ea68

Please sign in to comment.