diff options
| author |   David S. Miller <davem@davemloft.net> | 2022-01-31 11:42:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-01-31 11:42:13 +0000 |
| commit | 116ea68dc766f662f3d29ab19aa318b42b8d4dab (patch) | |
| tree | cd83d2520cd19b990d921b503c900c63a022e048 | |
| parent | net/fsl: xgmac_mdio: fix return value check in xgmac_mdio_probe() (diff) | |
| parent | sh_eth: sh_eth_close() always returns 0 (diff) | |
| download | wireguard-linux-116ea68dc766f662f3d29ab19aa318b42b8d4dab.tar.xz wireguard-linux-116ea68dc766f662f3d29ab19aa318b42b8d4dab.zip | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/renesas/ravb_main.c | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 80366661a361..24e2635c4c80 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -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); } diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 8aa91e99227d..9ff6089905d6 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -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; |