Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/phy/phy-core.c

+24 −5
Original line number Diff line number Diff line
@@ -783,24 +783,43 @@ int phy_write_paged(struct phy_device *phydev, int page, u32 regnum, u16 val) 
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

 * @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().

 * 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)

{

	int ret = 0, oldpage;



	oldpage = phy_select_page(phydev, page);

	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);

}

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);

include/linux/phy.h

+2 −0
Original line number Diff line number Diff line
@@ -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_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_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,

		     u16 mask, u16 set);