diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2017-01-04 15:10:50 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-04 13:47:54 -0500 |
| commit | 1940f240769ada7efe9d459991fe5dd80db3771a (patch) | |
| tree | f9c093edb69ba17b03951bdeaa06d640d1039cc9 /drivers/net/ethernet/renesas | |
| parent | sh_eth: handle only enabled E-MAC interrupts (diff) | |
| download | linux-dev-1940f240769ada7efe9d459991fe5dd80db3771a.tar.xz linux-dev-1940f240769ada7efe9d459991fe5dd80db3771a.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/renesas')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index c89569509a47..72a1fad4e930 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1542,13 +1542,11 @@ static void sh_eth_error(struct net_device *ndev, u32 intr_status) 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 { |