net: phy: marvell: remove superseded function marvell_set_downshift

Instead of superseded function marvell_set_downshift() we can use new
function m88e1111_set_downshift() in m88e1116r_config_init().
For this m88e1116r_config_init() has to be moved in the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 9716b39..0a814fd 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -53,7 +53,6 @@
 
 #define MII_M1011_PHY_SCR                      0x10
 #define MII_M1011_PHY_SCR_DOWNSHIFT_EN         BIT(11)
-#define MII_M1011_PHY_SCR_DOWNSHIFT_SHIFT      12
 #define MII_M1011_PHY_SRC_DOWNSHIFT_MASK       GENMASK(14, 12)
 #define MII_M1011_PHY_SCR_DOWNSHIFT_MAX                8
 #define MII_M1011_PHY_SCR_MDI                  (0x0 << 5)
@@ -277,23 +276,6 @@ static int marvell_set_polarity(struct phy_device *phydev, int polarity)
        return val != reg;
 }
 
-static int marvell_set_downshift(struct phy_device *phydev, bool enable,
-                                u8 retries)
-{
-       int reg;
-
-       reg = phy_read(phydev, MII_M1011_PHY_SCR);
-       if (reg < 0)
-               return reg;
-
-       reg &= MII_M1011_PHY_SRC_DOWNSHIFT_MASK;
-       reg |= ((retries - 1) << MII_M1011_PHY_SCR_DOWNSHIFT_SHIFT);
-       if (enable)
-               reg |= MII_M1011_PHY_SCR_DOWNSHIFT_EN;
-
-       return phy_write(phydev, MII_M1011_PHY_SCR, reg);
-}
-
 static int marvell_config_aneg(struct phy_device *phydev)
 {
        int changed = 0;
@@ -662,41 +644,6 @@ static int marvell_config_init(struct phy_device *phydev)
        return marvell_of_reg_init(phydev);
 }
 
-static int m88e1116r_config_init(struct phy_device *phydev)
-{
-       int err;
-
-       err = genphy_soft_reset(phydev);
-       if (err < 0)
-               return err;
-
-       msleep(500);
-
-       err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
-       if (err < 0)
-               return err;
-
-       err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
-       if (err < 0)
-               return err;
-
-       err = marvell_set_downshift(phydev, true, 8);
-       if (err < 0)
-               return err;
-
-       if (phy_interface_is_rgmii(phydev)) {
-               err = m88e1121_config_aneg_rgmii_delays(phydev);
-               if (err < 0)
-                       return err;
-       }
-
-       err = genphy_soft_reset(phydev);
-       if (err < 0)
-               return err;
-
-       return marvell_config_init(phydev);
-}
-
 static int m88e3016_config_init(struct phy_device *phydev)
 {
        int ret;
@@ -910,6 +857,41 @@ static void m88e1111_link_change_notify(struct phy_device *phydev)
                phydev_warn(phydev, "Downshift occurred! Cabling may be defective.\n");
 }
 
+static int m88e1116r_config_init(struct phy_device *phydev)
+{
+       int err;
+
+       err = genphy_soft_reset(phydev);
+       if (err < 0)
+               return err;
+
+       msleep(500);
+
+       err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);
+       if (err < 0)
+               return err;
+
+       err = marvell_set_polarity(phydev, phydev->mdix_ctrl);
+       if (err < 0)
+               return err;
+
+       err = m88e1111_set_downshift(phydev, 8);
+       if (err < 0)
+               return err;
+
+       if (phy_interface_is_rgmii(phydev)) {
+               err = m88e1121_config_aneg_rgmii_delays(phydev);
+               if (err < 0)
+                       return err;
+       }
+
+       err = genphy_soft_reset(phydev);
+       if (err < 0)
+               return err;
+
+       return marvell_config_init(phydev);
+}
+
 static int m88e1318_config_init(struct phy_device *phydev)
 {
        if (phy_interrupt_is_valid(phydev)) {