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>

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index a197e11f3a564470168dd64244f736b49f52c749..c17654f5ce32662031c91a53f3280f4a57e6c1aa 100644 (file)
--- 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)