diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2018-11-19 00:23:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-19 03:16:20 +0300 |
| commit | 034289b2d7cf29c8ddb79cf73d4886edabcff05e (patch) | |
| tree | e7e07843ecca527a78eb6ec6198b5b1410e813c9 /drivers/net/phy/icplus.c | |
| parent | fdc13a9effd5359ae00705708c8c846b1cb2b69c (diff) | |
| download | linux-034289b2d7cf29c8ddb79cf73d4886edabcff05e.tar.xz | |
net: phy: icplus: keep all ip101a_g functions together
This simply moves ip101a_g_config_init right above
ip101a_g_config_intr so all functions for the ICPlus IP101A/G PHYs are
grouped together.
No functional changes.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/icplus.c')
| -rw-r--r-- | drivers/net/phy/icplus.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index ad87bd3280d7..3d3e9134c762 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c @@ -162,21 +162,6 @@ static int ip1001_config_init(struct phy_device *phydev) return 0; } -static int ip101a_g_config_init(struct phy_device *phydev) -{ - int c; - - c = ip1xx_reset(phydev); - if (c < 0) - return c; - - /* Enable Auto Power Saving mode */ - c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); - c |= IP101A_G_APS_ON; - - return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); -} - static int ip175c_read_status(struct phy_device *phydev) { if (phydev->mdio.addr == 4) /* WAN port */ @@ -196,6 +181,21 @@ static int ip175c_config_aneg(struct phy_device *phydev) return 0; } +static int ip101a_g_config_init(struct phy_device *phydev) +{ + int c; + + c = ip1xx_reset(phydev); + if (c < 0) + return c; + + /* Enable Auto Power Saving mode */ + c = phy_read(phydev, IP10XX_SPEC_CTRL_STATUS); + c |= IP101A_G_APS_ON; + + return phy_write(phydev, IP10XX_SPEC_CTRL_STATUS, c); +} + static int ip101a_g_config_intr(struct phy_device *phydev) { u16 val; |