Commit f40a673d authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: phy: move phy_link_change() prior to mdio_bus_phy_may_suspend() 



In an upcoming change, mdio_bus_phy_may_suspend() will need to
distinguish a phylib-based PHY client from a phylink PHY client.
For that, it will need to compare the phydev->phy_link_change() function
pointer with the eponymous phy_link_change() provided by phylib.

To avoid forward function declarations, the default PHY link state
change method should be moved upwards. There is no functional change
associated with this patch, it is only to reduce the noise from a real
bug fix.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/20250407093900.2155112-1-vladimir.oltean@nxp.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 29d26146

drivers/net/phy/phy_device.c

+13 −13
Original line number Diff line number Diff line
@@ -244,6 +244,19 @@ static bool phy_drv_wol_enabled(struct phy_device *phydev) 
	return wol.wolopts != 0;

}



static void phy_link_change(struct phy_device *phydev, bool up)

{

	struct net_device *netdev = phydev->attached_dev;



	if (up)

		netif_carrier_on(netdev);

	else

		netif_carrier_off(netdev);

	phydev->adjust_link(netdev);

	if (phydev->mii_ts && phydev->mii_ts->link_state)

		phydev->mii_ts->link_state(phydev->mii_ts, phydev);

}



static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)

{

	struct device_driver *drv = phydev->mdio.dev.driver;
@@ -1055,19 +1068,6 @@ struct phy_device *phy_find_first(struct mii_bus *bus) 
}

EXPORT_SYMBOL(phy_find_first);



static void phy_link_change(struct phy_device *phydev, bool up)

{

	struct net_device *netdev = phydev->attached_dev;



	if (up)

		netif_carrier_on(netdev);

	else

		netif_carrier_off(netdev);

	phydev->adjust_link(netdev);

	if (phydev->mii_ts && phydev->mii_ts->link_state)

		phydev->mii_ts->link_state(phydev->mii_ts, phydev);

}



/**

 * phy_prepare_link - prepares the PHY layer to monitor link status

 * @phydev: target phy_device struct