hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Russell King 2017-04-13 16:49:20 +01:00 committed by David S. Miller
parent d06130377c
commit 786df9c2a4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/phy/phy.c
View File

@ -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;
} }