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

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

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+4 −4
Original line number Diff line number Diff line
@@ -716,15 +716,15 @@ static void stmmac_adjust_link(struct net_device *dev) 
			new_state = 1;

			switch (phydev->speed) {

			case 1000:

				if (likely(priv->plat->has_gmac ||

					   priv->plat->has_gmac4))

				if (priv->plat->has_gmac ||

				    priv->plat->has_gmac4)

					ctrl &= ~priv->hw->link.port;

				stmmac_hw_fix_mac_speed(priv);

				break;

			case 100:

			case 10:

				if (likely(priv->plat->has_gmac ||

					   priv->plat->has_gmac4)) {

				if (priv->plat->has_gmac ||

				    priv->plat->has_gmac4) {

					ctrl |= priv->hw->link.port;

					if (phydev->speed == SPEED_100) {

						ctrl |= priv->hw->link.speed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE