Commit 3e12790e authored by LABBE Corentin's avatar LABBE Corentin Committed by David S. Miller

net: stmmac: likely is useless in occasional function

The stmmac_adjust_link() function is called too rarely for having
likely() macros being useful.
Just remove likely annotation in it.
Signed-off-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb2c0ace
...@@ -716,15 +716,15 @@ static void stmmac_adjust_link(struct net_device *dev) ...@@ -716,15 +716,15 @@ static void stmmac_adjust_link(struct net_device *dev)
new_state = 1; new_state = 1;
switch (phydev->speed) { switch (phydev->speed) {
case 1000: case 1000:
if (likely(priv->plat->has_gmac || if (priv->plat->has_gmac ||
priv->plat->has_gmac4)) priv->plat->has_gmac4)
ctrl &= ~priv->hw->link.port; ctrl &= ~priv->hw->link.port;
stmmac_hw_fix_mac_speed(priv); stmmac_hw_fix_mac_speed(priv);
break; break;
case 100: case 100:
case 10: case 10:
if (likely(priv->plat->has_gmac || if (priv->plat->has_gmac ||
priv->plat->has_gmac4)) { priv->plat->has_gmac4) {
ctrl |= priv->hw->link.port; ctrl |= priv->hw->link.port;
if (phydev->speed == SPEED_100) { if (phydev->speed == SPEED_100) {
ctrl |= priv->hw->link.speed; ctrl |= priv->hw->link.speed;
......
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