aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2018-11-18 22:23:55 +0100
committerDavid S. Miller <davem@davemloft.net>2018-11-18 16:16:20 -0800
commit034289b2d7cf29c8ddb79cf73d4886edabcff05e (patch)
treee7e07843ecca527a78eb6ec6198b5b1410e813c9 /drivers/net/phy
parentdt-bindings: net: phy: add bindings for the IC Plus Corp. IP101A/G PHYs (diff)
downloadlinux-dev-034289b2d7cf29c8ddb79cf73d4886edabcff05e.tar.xz
linux-dev-034289b2d7cf29c8ddb79cf73d4886edabcff05e.zip
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')
-rw-r--r--drivers/net/phy/icplus.c30
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;