diff options
| author |   Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2018-02-18 18:21:05 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-19 11:33:57 -0500 |
| commit | 607ea03221ff84943e840d3707dbeb0b4b88959f (patch) | |
| tree | ba04533ca38177908d64340681356899db3ad66e | |
| parent | Merge branch 'dwmac-meson8b-small-cleanup' (diff) | |
| download | linux-dev-607ea03221ff84943e840d3707dbeb0b4b88959f.tar.xz linux-dev-607ea03221ff84943e840d3707dbeb0b4b88959f.zip | |
sh_eth: simplify sh_eth_check_reset()
The *while* loop in this function can be turned into a normal *for* loop.
And getting rid of the single return point saves us a few more LoCs...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index a197e11f3a56..c17654f5ce32 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -962,20 +962,16 @@ static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd) static int sh_eth_check_reset(struct net_device *ndev) { - int ret = 0; - int cnt = 100; + int cnt; - while (cnt > 0) { + for (cnt = 100; cnt > 0; cnt--) { if (!(sh_eth_read(ndev, EDMR) & EDMR_SRST_GETHER)) - break; + return 0; mdelay(1); - cnt--; - } - if (cnt <= 0) { - netdev_err(ndev, "Device reset failed\n"); - ret = -ETIMEDOUT; } - return ret; + + netdev_err(ndev, "Device reset failed\n"); + return -ETIMEDOUT; } static int sh_eth_reset(struct net_device *ndev) |