| From 955ebb247da75101463bbe090d3362d6ce26ab0a Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Wed, 4 Jan 2017 15:10:50 +0300 |
| Subject: [PATCH 125/255] sh_eth: no need for *else* after *goto* |
| |
| Well, checkpatch.pl complains about *else* after *return* and *break* but |
| not after *goto*... and it probably should have complained about the code |
| in sh_eth_error(). Win couple LoCs by removing that *else*. :-) |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 1940f240769ada7efe9d459991fe5dd80db3771a) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 10 ++++------ |
| 1 file changed, 4 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -1556,13 +1556,11 @@ static void sh_eth_error(struct net_devi |
| ndev->stats.tx_carrier_errors++; |
| if (felic_stat & ECSR_LCHNG) { |
| /* Link Changed */ |
| - if (mdp->cd->no_psr || mdp->no_ether_link) { |
| + if (mdp->cd->no_psr || mdp->no_ether_link) |
| goto ignore_link; |
| - } else { |
| - link_stat = (sh_eth_read(ndev, PSR)); |
| - if (mdp->ether_link_active_low) |
| - link_stat = ~link_stat; |
| - } |
| + link_stat = sh_eth_read(ndev, PSR); |
| + if (mdp->ether_link_active_low) |
| + link_stat = ~link_stat; |
| if (!(link_stat & PHY_ST_LINK)) { |
| sh_eth_rcv_snd_disable(ndev); |
| } else { |
