net: phy: simplify phy_supported_speeds()

Simplify the loop in phy_supported_speeds().

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 00280d4eeb563099ae1ab4d177f62c27347751b3..6afbd973a779b7aca01d5b7c0607222118702437 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -320,17 +320,11 @@ unsigned int phy_supported_speeds(struct phy_device *phy,
        unsigned int count = 0;
        unsigned int idx = 0;
 
-       for (idx = 0; idx < ARRAY_SIZE(settings) && count < size; idx++) {
-               if (!(settings[idx].setting & phy->supported))
-                       continue;
-
+       for (idx = 0; idx < ARRAY_SIZE(settings) && count < size; idx++)
                /* Assumes settings are grouped by speed */
-               if ((count == 0) ||
-                   (speeds[count - 1] != settings[idx].speed)) {
-                       speeds[count] = settings[idx].speed;
-                       count++;
-               }
-       }
+               if ((settings[idx].setting & phy->supported) &&
+                   (count == 0 || speeds[count - 1] != settings[idx].speed))
+                       speeds[count++] = settings[idx].speed;
 
        return count;
 }