Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -7
+1 -4
drivers/net/ethernet/renesas/ravb_main.c
··· 2848 2848 { 2849 2849 struct ravb_private *priv = netdev_priv(ndev); 2850 2850 const struct ravb_hw_info *info = priv->info; 2851 - int ret; 2852 2851 2853 2852 if (info->nc_queues) 2854 2853 napi_enable(&priv->napi[RAVB_NC]); ··· 2856 2857 /* Disable MagicPacket */ 2857 2858 ravb_modify(ndev, ECMR, ECMR_MPDE, 0); 2858 2859 2859 - ret = ravb_close(ndev); 2860 - if (ret < 0) 2861 - return ret; 2860 + ravb_close(ndev); 2862 2861 2863 2862 return disable_irq_wake(priv->emac_irq); 2864 2863 }
+1 -3
drivers/net/ethernet/renesas/sh_eth.c
··· 3444 3444 * both be reset and all registers restored. This is what 3445 3445 * happens during suspend and resume without WoL enabled. 3446 3446 */ 3447 - ret = sh_eth_close(ndev); 3448 - if (ret < 0) 3449 - return ret; 3447 + sh_eth_close(ndev); 3450 3448 ret = sh_eth_open(ndev); 3451 3449 if (ret < 0) 3452 3450 return ret;