Commit bf22b343 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: add phy_modify_paged_changed

Add helper function phy_modify_paged_changed, behavios is the same
as for phy_modify_changed.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4069cd7
...@@ -783,24 +783,43 @@ int phy_write_paged(struct phy_device *phydev, int page, u32 regnum, u16 val) ...@@ -783,24 +783,43 @@ int phy_write_paged(struct phy_device *phydev, int page, u32 regnum, u16 val)
EXPORT_SYMBOL(phy_write_paged); EXPORT_SYMBOL(phy_write_paged);
/** /**
* phy_modify_paged() - Convenience function for modifying a paged register * phy_modify_paged_changed() - Function for modifying a paged register
* @phydev: a pointer to a &struct phy_device * @phydev: a pointer to a &struct phy_device
* @page: the page for the phy * @page: the page for the phy
* @regnum: register number * @regnum: register number
* @mask: bit mask of bits to clear * @mask: bit mask of bits to clear
* @set: bit mask of bits to set * @set: bit mask of bits to set
* *
* Same rules as for phy_read() and phy_write(). * Returns negative errno, 0 if there was no change, and 1 in case of change
*/ */
int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum, int phy_modify_paged_changed(struct phy_device *phydev, int page, u32 regnum,
u16 mask, u16 set) u16 mask, u16 set)
{ {
int ret = 0, oldpage; int ret = 0, oldpage;
oldpage = phy_select_page(phydev, page); oldpage = phy_select_page(phydev, page);
if (oldpage >= 0) if (oldpage >= 0)
ret = __phy_modify(phydev, regnum, mask, set); ret = __phy_modify_changed(phydev, regnum, mask, set);
return phy_restore_page(phydev, oldpage, ret); return phy_restore_page(phydev, oldpage, ret);
} }
EXPORT_SYMBOL(phy_modify_paged_changed);
/**
* phy_modify_paged() - Convenience function for modifying a paged register
* @phydev: a pointer to a &struct phy_device
* @page: the page for the phy
* @regnum: register number
* @mask: bit mask of bits to clear
* @set: bit mask of bits to set
*
* Same rules as for phy_read() and phy_write().
*/
int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum,
u16 mask, u16 set)
{
int ret = phy_modify_paged_changed(phydev, page, regnum, mask, set);
return ret < 0 ? ret : 0;
}
EXPORT_SYMBOL(phy_modify_paged); EXPORT_SYMBOL(phy_modify_paged);
...@@ -984,6 +984,8 @@ int phy_select_page(struct phy_device *phydev, int page); ...@@ -984,6 +984,8 @@ int phy_select_page(struct phy_device *phydev, int page);
int phy_restore_page(struct phy_device *phydev, int oldpage, int ret); int phy_restore_page(struct phy_device *phydev, int oldpage, int ret);
int phy_read_paged(struct phy_device *phydev, int page, u32 regnum); int phy_read_paged(struct phy_device *phydev, int page, u32 regnum);
int phy_write_paged(struct phy_device *phydev, int page, u32 regnum, u16 val); int phy_write_paged(struct phy_device *phydev, int page, u32 regnum, u16 val);
int phy_modify_paged_changed(struct phy_device *phydev, int page, u32 regnum,
u16 mask, u16 set);
int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum, int phy_modify_paged(struct phy_device *phydev, int page, u32 regnum,
u16 mask, u16 set); u16 mask, u16 set);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment