net: stmmac: qcom-ethqos: remove ethqos->speed

Rather than ethqos_fix_mac_speed() storing the speed in struct
qcom_ethqos and then functions that are only called from here reading
that speed, pass the speed to the called functions instead.

This removes all readers of this struct member, which then allows the
removal of the two places that set its value and the struct member.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1u3bYQ-000EcK-9K@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
index 5d8cd43..cd25aea 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -106,12 +106,11 @@ struct qcom_ethqos {
        struct platform_device *pdev;
        void __iomem *rgmii_base;
        void __iomem *mac_base;
-       int (*configure_func)(struct qcom_ethqos *ethqos);
+       int (*configure_func)(struct qcom_ethqos *ethqos, int speed);
 
        unsigned int link_clk_rate;
        struct clk *link_clk;
        struct phy *serdes_phy;
-       int speed;
        int serdes_speed;
        phy_interface_t phy_mode;
 
@@ -385,7 +384,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
        return 0;
 }
 
-static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
+static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos, int speed)
 {
        struct device *dev = &ethqos->pdev->dev;
        int phase_shift;
@@ -412,7 +411,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
        rgmii_updatel(ethqos, RGMII_CONFIG_INTF_SEL,
                      0, RGMII_IO_MACRO_CONFIG);
 
-       switch (ethqos->speed) {
+       switch (speed) {
        case SPEED_1000:
                rgmii_updatel(ethqos, RGMII_CONFIG_DDR_MODE,
                              RGMII_CONFIG_DDR_MODE, RGMII_IO_MACRO_CONFIG);
@@ -532,14 +531,14 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
                              loopback, RGMII_IO_MACRO_CONFIG);
                break;
        default:
-               dev_err(dev, "Invalid speed %d\n", ethqos->speed);
+               dev_err(dev, "Invalid speed %d\n", speed);
                return -EINVAL;
        }
 
        return 0;
 }
 
-static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos)
+static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos, int speed)
 {
        struct device *dev = &ethqos->pdev->dev;
        volatile unsigned int dll_lock;
@@ -562,7 +561,7 @@ static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos)
                      SDCC_DLL_CONFIG_PDN, SDCC_HC_REG_DLL_CONFIG);
 
        if (ethqos->has_emac_ge_3) {
-               if (ethqos->speed == SPEED_1000) {
+               if (speed == SPEED_1000) {
                        rgmii_writel(ethqos, 0x1800000, SDCC_TEST_CTL);
                        rgmii_writel(ethqos, 0x2C010800, SDCC_USR_CTL);
                        rgmii_writel(ethqos, 0xA001, SDCC_HC_REG_DLL_CONFIG2);
@@ -580,7 +579,7 @@ static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos)
        rgmii_updatel(ethqos, SDCC_DLL_CONFIG_PDN, 0,
                      SDCC_HC_REG_DLL_CONFIG);
 
-       if (ethqos->speed != SPEED_100 && ethqos->speed != SPEED_10) {
+       if (speed != SPEED_100 && speed != SPEED_10) {
                /* Set DLL_EN */
                rgmii_updatel(ethqos, SDCC_DLL_CONFIG_DLL_EN,
                              SDCC_DLL_CONFIG_DLL_EN, SDCC_HC_REG_DLL_CONFIG);
@@ -607,10 +606,10 @@ static int ethqos_configure_rgmii(struct qcom_ethqos *ethqos)
                        dev_err(dev, "Timeout while waiting for DLL lock\n");
        }
 
-       if (ethqos->speed == SPEED_1000)
+       if (speed == SPEED_1000)
                ethqos_dll_configure(ethqos);
 
-       ethqos_rgmii_macro_init(ethqos);
+       ethqos_rgmii_macro_init(ethqos, speed);
 
        return 0;
 }
@@ -626,7 +625,7 @@ static void ethqos_set_serdes_speed(struct qcom_ethqos *ethqos, int speed)
 /* On interface toggle MAC registers gets reset.
  * Configure MAC block for SGMII on ethernet phy link up
  */
-static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos)
+static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos, int speed)
 {
        struct net_device *dev = platform_get_drvdata(ethqos->pdev);
        struct stmmac_priv *priv = netdev_priv(dev);
@@ -634,7 +633,7 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos)
 
        val = readl(ethqos->mac_base + MAC_CTRL_REG);
 
-       switch (ethqos->speed) {
+       switch (speed) {
        case SPEED_2500:
                val &= ~ETHQOS_MAC_CTRL_PORT_SEL;
                rgmii_updatel(ethqos, RGMII_CONFIG2_RGMII_CLK_SEL_CFG,
@@ -681,9 +680,9 @@ static void qcom_ethqos_speed_mode_2500(struct net_device *ndev, void *data)
        priv->plat->phy_interface = PHY_INTERFACE_MODE_2500BASEX;
 }
 
-static int ethqos_configure(struct qcom_ethqos *ethqos)
+static int ethqos_configure(struct qcom_ethqos *ethqos, int speed)
 {
-       return ethqos->configure_func(ethqos);
+       return ethqos->configure_func(ethqos, speed);
 }
 
 static void ethqos_fix_mac_speed(void *priv, int speed, unsigned int mode)
@@ -691,9 +690,8 @@ static void ethqos_fix_mac_speed(void *priv, int speed, unsigned int mode)
        struct qcom_ethqos *ethqos = priv;
 
        qcom_ethqos_set_sgmii_loopback(ethqos, false);
-       ethqos->speed = speed;
        ethqos_update_link_clk(ethqos, speed);
-       ethqos_configure(ethqos);
+       ethqos_configure(ethqos, speed);
 }
 
 static int qcom_ethqos_serdes_powerup(struct net_device *ndev, void *priv)
@@ -847,7 +845,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
                return dev_err_probe(dev, PTR_ERR(ethqos->serdes_phy),
                                     "Failed to get serdes phy\n");
 
-       ethqos->speed = SPEED_1000;
        ethqos->serdes_speed = SPEED_1000;
        ethqos_update_link_clk(ethqos, SPEED_1000);
        ethqos_set_func_clk_en(ethqos);