net: phy: add helpers phy_(un)lock_mdio_bus
Subsystems (3)
Heiner Kallweit
maintainerPATCH 1/1 net: phy: add helpers phy_(un)lock_mdio_bus
Add helpers to make locking/unlocking the MDIO bus easier.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/phy/phy-core.c | 28 ++++++++++++++-------------- include/linux/phy.h | 10 ++++++++++ 2 files changed, 24 insertions(+), 14 deletions(-)
drivers/net/phy/phy-core.c +14 -14
@@ -419,9 +419,9 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) {int ret; -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev); ret =__phy_read_mmd (phydev, devad, regnum); -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
@@ -480,9 +480,9 @@ int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val) {int ret; -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev); ret =__phy_write_mmd (phydev, devad, regnum, val); -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
@@ -536,9 +536,9 @@ int phy_modify_changed(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) {int ret; -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev); ret =__phy_modify_changed (phydev, regnum, mask, set); -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
@@ -580,9 +580,9 @@ int phy_modify(struct phy_device *phydev, u32 regnum, u16 mask, u16 set) {int ret; -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev); ret =__phy_modify (phydev, regnum, mask, set); -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
@@ -639,9 +639,9 @@ int phy_modify_mmd_changed(struct phy_device *phydev, int devad, u32 regnum, {int ret; -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev); ret =__phy_modify_mmd_changed (phydev, devad, regnum, mask, set); -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
@@ -687,9 +687,9 @@ int phy_modify_mmd(struct phy_device *phydev, int devad, u32 regnum, {int ret; -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev); ret =__phy_modify_mmd (phydev, devad, regnum, mask, set); -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
@@ -721,7 +721,7 @@ static int __phy_write_page(struct phy_device *phydev, int page)*/ int phy_save_page (struct phy_device *phydev) { -mutex_lock (&phydev->mdio.bus->mdio_lock); +phy_lock_mdio_bus (phydev);return __phy_read_page (phydev); }EXPORT_SYMBOL_GPL (phy_save_page);
@@ -788,7 +788,7 @@ int phy_restore_page(struct phy_device *phydev, int oldpage, int ret) ret = oldpage; } -mutex_unlock (&phydev->mdio.bus->mdio_lock); +phy_unlock_mdio_bus (phydev);return ret; }
include/linux/phy.h +10 -0
@@ -1076,6 +1076,16 @@ static inline const char *phydev_name(const struct phy_device *phydev)return dev_name (&phydev->mdio.dev); } +static inline void phy_lock_mdio_bus (struct phy_device *phydev) +{ +mutex_lock (&phydev->mdio.bus->mdio_lock); +} + +static inline void phy_unlock_mdio_bus (struct phy_device *phydev) +{ +mutex_unlock (&phydev->mdio.bus->mdio_lock); +} + void phy_attached_print(struct phy_device *phydev, const char *fmt, ...) __printf(2, 3);void phy_attached_info (struct phy_device *phydev);
Signature · 1 line
2.24.0
From: Heiner Kallweit <[email protected]>
Date: Sat, 23 Nov 2019 17:28:37 +0100
Quoted 3 lines
Add helpers to make locking/unlocking the MDIO bus easier.
Signed-off-by Heiner Kallweit <[email protected]>
Applied, thanks.