| Message ID | 20220129115517.11891-3-s.shtylyov@omp.ru (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | e7d966f9ea52c4c77491646068dbd5412a6225b4 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | Remove some dead code in the Renesas Ethernet drivers | expand |
Hi Sergei, On Tue, Feb 1, 2022 at 3:00 AM Sergey Shtylyov <s.shtylyov@omp.ru> wrote: > sh_eth_close() always returns 0, hence the check in sh_eth_wol_restore() > is pointless (however we cannot change the prototype of sh_eth_close() as > it implements the driver's ndo_stop() method). > > Found by Linux Verification Center (linuxtesting.org) with the SVACE static > analysis tool. > > Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> Thanks for your patch! Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Note that there's a second call in sh_eth_suspend(). Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 01.02.2022 11:58, Geert Uytterhoeven wrote: [...] >> sh_eth_close() always returns 0, hence the check in sh_eth_wol_restore() >> is pointless (however we cannot change the prototype of sh_eth_close() as >> it implements the driver's ndo_stop() method). >> >> Found by Linux Verification Center (linuxtesting.org) with the SVACE static >> analysis tool. >> >> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> > > Thanks for your patch! > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Note that there's a second call in sh_eth_suspend(). Made no sense to change it. :-) > Gr{oetje,eeting}s, > > Geert MBR, Sergey
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index d947a628e166..b21e101b4484 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -3450,9 +3450,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;
sh_eth_close() always returns 0, hence the check in sh_eth_wol_restore() is pointless (however we cannot change the prototype of sh_eth_close() as it implements the driver's ndo_stop() method). Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru> --- drivers/net/ethernet/renesas/sh_eth.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)