From: Heiner Kallweit Date: Sun, 9 Mar 2025 20:04:14 +0000 (+0100) Subject: net: phy: move PHY package MMD access function declarations from phy.h to phylib.h X-Git-Tag: io_uring-6.15-20250403~82^2~101^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=43e2aa56aea2e292c209cfd77c3f2d8553fb66e9;p=linux-block.git net: phy: move PHY package MMD access function declarations from phy.h to phylib.h These functions are used by PHY drivers only, therefore move their declaration to phylib.h. Signed-off-by: Heiner Kallweit Reviewed-by: Simon Horman Link: https://patch.msgid.link/406c8a20-b62e-4ee3-b174-b566724a0876@gmail.com Signed-off-by: Paolo Abeni --- diff --git a/drivers/net/phy/phylib.h b/drivers/net/phy/phylib.h index f0e499fed1f7..c15484a805b3 100644 --- a/drivers/net/phy/phylib.h +++ b/drivers/net/phy/phylib.h @@ -15,6 +15,12 @@ int __phy_package_read(struct phy_device *phydev, unsigned int addr_offset, u32 regnum); int __phy_package_write(struct phy_device *phydev, unsigned int addr_offset, u32 regnum, u16 val); +int __phy_package_read_mmd(struct phy_device *phydev, + unsigned int addr_offset, int devad, + u32 regnum); +int __phy_package_write_mmd(struct phy_device *phydev, + unsigned int addr_offset, int devad, + u32 regnum, u16 val); bool phy_package_init_once(struct phy_device *phydev); bool phy_package_probe_once(struct phy_device *phydev); int phy_package_join(struct phy_device *phydev, int base_addr, size_t priv_size); diff --git a/include/linux/phy.h b/include/linux/phy.h index c4a6385faf41..fc028bab10b7 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -2107,18 +2107,10 @@ int __phy_hwtstamp_set(struct phy_device *phydev, struct kernel_hwtstamp_config *config, struct netlink_ext_ack *extack); -int __phy_package_read_mmd(struct phy_device *phydev, - unsigned int addr_offset, int devad, - u32 regnum); - int phy_package_read_mmd(struct phy_device *phydev, unsigned int addr_offset, int devad, u32 regnum); -int __phy_package_write_mmd(struct phy_device *phydev, - unsigned int addr_offset, int devad, - u32 regnum, u16 val); - int phy_package_write_mmd(struct phy_device *phydev, unsigned int addr_offset, int devad, u32 regnum, u16 val);