diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-02-06 09:52:43 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-06 09:52:43 -0800 |
| commit | d9b5a67522d5d28003a7a2953b2df15c396ffd09 (patch) | |
| tree | cc5cc9e7738979c93c1568f0b4d55896502c7db6 /drivers/net/phy/dp83tc811.c | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2019-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next (diff) | |
| parent | net: phy: make use of new MMD accessors (diff) | |
| download | linux-dev-d9b5a67522d5d28003a7a2953b2df15c396ffd09.tar.xz linux-dev-d9b5a67522d5d28003a7a2953b2df15c396ffd09.zip | |
Merge branch 'net-phy-add-and-use-further-MMD-accessors'
Heiner Kallweit says:
====================
net: phy: add and use further MMD accessors
Add MMD accessors for modifying MMD registers and clearing / setting
bits in MMD registers. Use these accessors in PHY drivers and phylib.
v2:
- fix SoB in patch 2
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/phy/dp83tc811.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/net/phy/dp83tc811.c b/drivers/net/phy/dp83tc811.c index da13356999e5..e9704af1d239 100644 --- a/drivers/net/phy/dp83tc811.c +++ b/drivers/net/phy/dp83tc811.c @@ -144,11 +144,8 @@ static int dp83811_set_wol(struct phy_device *phydev, phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG, value); } else { - value = phy_read_mmd(phydev, DP83811_DEVADDR, - MII_DP83811_WOL_CFG); - value &= ~DP83811_WOL_EN; - phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG, - value); + phy_clear_bits_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG, + DP83811_WOL_EN); } return 0; @@ -328,14 +325,10 @@ static int dp83811_suspend(struct phy_device *phydev) static int dp83811_resume(struct phy_device *phydev) { - int value; - genphy_resume(phydev); - value = phy_read_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG); - - phy_write_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG, value | - DP83811_WOL_CLR_INDICATION); + phy_set_bits_mmd(phydev, DP83811_DEVADDR, MII_DP83811_WOL_CFG, + DP83811_WOL_CLR_INDICATION); return 0; } |