diff options
| author | Arun Ramadoss <arun.ramadoss@microchip.com> | 2022-03-07 21:45:15 +0530 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-03-08 13:34:33 +0100 |
| commit | f1f3a674261e08f318a4bbe06391874ffdd9383f (patch) | |
| tree | bc7cd52829f79b333fe953954849f955b98c0963 | |
| parent | 64807c2321512f67959e51f09e302c145c336184 (diff) | |
| download | linux-stable-f1f3a674261e08f318a4bbe06391874ffdd9383f.tar.gz linux-stable-f1f3a674261e08f318a4bbe06391874ffdd9383f.tar.bz2 linux-stable-f1f3a674261e08f318a4bbe06391874ffdd9383f.zip | |
net: phy: lan87xx: use genphy_read_master_slave in read_status
To read the master slave configuration of the LAN87xx T1 phy, used the
generic phy driver genphy_read_master_slave function. Removed the local
lan87xx_read_master_slave function.
Signed-off-by: Arun Ramadoss <arun.ramadoss@microchip.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | drivers/net/phy/microchip_t1.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/drivers/net/phy/microchip_t1.c b/drivers/net/phy/microchip_t1.c index 8292f7305805..389df3f4293c 100644 --- a/drivers/net/phy/microchip_t1.c +++ b/drivers/net/phy/microchip_t1.c @@ -674,34 +674,6 @@ static int lan87xx_cable_test_get_status(struct phy_device *phydev, return 0; } -static int lan87xx_read_master_slave(struct phy_device *phydev) -{ - int rc = 0; - - phydev->master_slave_get = MASTER_SLAVE_CFG_UNKNOWN; - phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN; - - rc = phy_read(phydev, MII_CTRL1000); - if (rc < 0) - return rc; - - if (rc & CTL1000_AS_MASTER) - phydev->master_slave_get = MASTER_SLAVE_CFG_MASTER_FORCE; - else - phydev->master_slave_get = MASTER_SLAVE_CFG_SLAVE_FORCE; - - rc = phy_read(phydev, MII_STAT1000); - if (rc < 0) - return rc; - - if (rc & LPA_1000MSRES) - phydev->master_slave_state = MASTER_SLAVE_STATE_MASTER; - else - phydev->master_slave_state = MASTER_SLAVE_STATE_SLAVE; - - return rc; -} - static int lan87xx_read_status(struct phy_device *phydev) { int rc = 0; @@ -720,7 +692,7 @@ static int lan87xx_read_status(struct phy_device *phydev) phydev->pause = 0; phydev->asym_pause = 0; - rc = lan87xx_read_master_slave(phydev); + rc = genphy_read_master_slave(phydev); if (rc < 0) return rc; |