From: Heiner Kallweit Date: Thu, 13 Feb 2025 21:51:53 +0000 (+0100) Subject: net: phy: remove helper phy_is_internal X-Git-Tag: v6.15-rc1~160^2~319^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b2edfba74696e0defd181989c9effe911e6f54f;p=thirdparty%2Flinux.git net: phy: remove helper phy_is_internal Helper phy_is_internal() is just used in two places phylib-internally. So let's remove it from the API. Signed-off-by: Heiner Kallweit Reviewed-by: Mateusz Polchlopek Reviewed-by: Russell King (Oracle) Link: https://patch.msgid.link/f3f35265-80a9-4ed7-ad78-ae22c21e288b@gmail.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 29fb19bb712b0..f2086b0b7b76e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -302,7 +302,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev, cmd->base.port = PORT_BNC; else cmd->base.port = phydev->port; - cmd->base.transceiver = phy_is_internal(phydev) ? + cmd->base.transceiver = phydev->is_internal ? XCVR_INTERNAL : XCVR_EXTERNAL; cmd->base.phy_address = phydev->mdio.addr; cmd->base.autoneg = phydev->autoneg; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 1c10c774b9085..35ec99b4dc510 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -544,7 +544,7 @@ phy_interface_show(struct device *dev, struct device_attribute *attr, char *buf) struct phy_device *phydev = to_phy_device(dev); const char *mode = NULL; - if (phy_is_internal(phydev)) + if (phydev->is_internal) mode = "internal"; else mode = phy_modes(phydev->interface); diff --git a/include/linux/phy.h b/include/linux/phy.h index 2ab83d24a5733..3665cdd610a3d 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1739,15 +1739,6 @@ static inline bool phy_is_default_hwtstamp(struct phy_device *phydev) return phy_has_hwtstamp(phydev) && phydev->default_timestamp; } -/** - * phy_is_internal - Convenience function for testing if a PHY is internal - * @phydev: the phy_device struct - */ -static inline bool phy_is_internal(struct phy_device *phydev) -{ - return phydev->is_internal; -} - /** * phy_on_sfp - Convenience function for testing if a PHY is on an SFP module * @phydev: the phy_device struct