Commit 786df9c2 authored by Russell King's avatar Russell King Committed by David S. Miller

net: phy: simplify phy_supported_speeds()

Simplify the loop in phy_supported_speeds().
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0613037
...@@ -320,17 +320,11 @@ unsigned int phy_supported_speeds(struct phy_device *phy, ...@@ -320,17 +320,11 @@ unsigned int phy_supported_speeds(struct phy_device *phy,
unsigned int count = 0; unsigned int count = 0;
unsigned int idx = 0; unsigned int idx = 0;
for (idx = 0; idx < ARRAY_SIZE(settings) && count < size; idx++) { for (idx = 0; idx < ARRAY_SIZE(settings) && count < size; idx++)
if (!(settings[idx].setting & phy->supported))
continue;
/* Assumes settings are grouped by speed */ /* Assumes settings are grouped by speed */
if ((count == 0) || if ((settings[idx].setting & phy->supported) &&
(speeds[count - 1] != settings[idx].speed)) { (count == 0 || speeds[count - 1] != settings[idx].speed))
speeds[count] = settings[idx].speed; speeds[count++] = settings[idx].speed;
count++;
}
}
return count; return count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment