net: stmmac: dwmac-qcom-ethqos: use a helper variable for &pdev->dev

Shrink code and avoid line breaks by using a helper variable for
&pdev->dev.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
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 28d2514a879593144b092474ae8a055a1164a93b..f0776ddea3abcdb299aa334aa22efa96a4ff8065 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -123,25 +123,26 @@ static void rgmii_updatel(struct qcom_ethqos *ethqos,
 static void rgmii_dump(void *priv)
 {
        struct qcom_ethqos *ethqos = priv;
+       struct device *dev = &ethqos->pdev->dev;
 
-       dev_dbg(&ethqos->pdev->dev, "Rgmii register dump\n");
-       dev_dbg(&ethqos->pdev->dev, "RGMII_IO_MACRO_CONFIG: %x\n",
+       dev_dbg(dev, "Rgmii register dump\n");
+       dev_dbg(dev, "RGMII_IO_MACRO_CONFIG: %x\n",
                rgmii_readl(ethqos, RGMII_IO_MACRO_CONFIG));
-       dev_dbg(&ethqos->pdev->dev, "SDCC_HC_REG_DLL_CONFIG: %x\n",
+       dev_dbg(dev, "SDCC_HC_REG_DLL_CONFIG: %x\n",
                rgmii_readl(ethqos, SDCC_HC_REG_DLL_CONFIG));
-       dev_dbg(&ethqos->pdev->dev, "SDCC_HC_REG_DDR_CONFIG: %x\n",
+       dev_dbg(dev, "SDCC_HC_REG_DDR_CONFIG: %x\n",
                rgmii_readl(ethqos, SDCC_HC_REG_DDR_CONFIG));
-       dev_dbg(&ethqos->pdev->dev, "SDCC_HC_REG_DLL_CONFIG2: %x\n",
+       dev_dbg(dev, "SDCC_HC_REG_DLL_CONFIG2: %x\n",
                rgmii_readl(ethqos, SDCC_HC_REG_DLL_CONFIG2));
-       dev_dbg(&ethqos->pdev->dev, "SDC4_STATUS: %x\n",
+       dev_dbg(dev, "SDC4_STATUS: %x\n",
                rgmii_readl(ethqos, SDC4_STATUS));
-       dev_dbg(&ethqos->pdev->dev, "SDCC_USR_CTL: %x\n",
+       dev_dbg(dev, "SDCC_USR_CTL: %x\n",
                rgmii_readl(ethqos, SDCC_USR_CTL));
-       dev_dbg(&ethqos->pdev->dev, "RGMII_IO_MACRO_CONFIG2: %x\n",
+       dev_dbg(dev, "RGMII_IO_MACRO_CONFIG2: %x\n",
                rgmii_readl(ethqos, RGMII_IO_MACRO_CONFIG2));
-       dev_dbg(&ethqos->pdev->dev, "RGMII_IO_MACRO_DEBUG1: %x\n",
+       dev_dbg(dev, "RGMII_IO_MACRO_DEBUG1: %x\n",
                rgmii_readl(ethqos, RGMII_IO_MACRO_DEBUG1));
-       dev_dbg(&ethqos->pdev->dev, "EMAC_SYSTEM_LOW_POWER_DEBUG: %x\n",
+       dev_dbg(dev, "EMAC_SYSTEM_LOW_POWER_DEBUG: %x\n",
                rgmii_readl(ethqos, EMAC_SYSTEM_LOW_POWER_DEBUG));
 }
 
@@ -242,6 +243,7 @@ static const struct ethqos_emac_driver_data emac_v3_0_0_data = {
 
 static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
 {
+       struct device *dev = &ethqos->pdev->dev;
        unsigned int val;
        int retry = 1000;
 
@@ -279,7 +281,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
                retry--;
        } while (retry > 0);
        if (!retry)
-               dev_err(&ethqos->pdev->dev, "Clear CK_OUT_EN timedout\n");
+               dev_err(dev, "Clear CK_OUT_EN timedout\n");
 
        /* Set CK_OUT_EN */
        rgmii_updatel(ethqos, SDCC_DLL_CONFIG_CK_OUT_EN,
@@ -296,7 +298,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
                retry--;
        } while (retry > 0);
        if (!retry)
-               dev_err(&ethqos->pdev->dev, "Set CK_OUT_EN timedout\n");
+               dev_err(dev, "Set CK_OUT_EN timedout\n");
 
        /* Set DDR_CAL_EN */
        rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_DDR_CAL_EN,
@@ -322,12 +324,13 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
 
 static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
 {
+       struct device *dev = &ethqos->pdev->dev;
        int phase_shift;
        int phy_mode;
        int loopback;
 
        /* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */
-       phy_mode = device_get_phy_mode(&ethqos->pdev->dev);
+       phy_mode = device_get_phy_mode(dev);
        if (phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
            phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
                phase_shift = 0;
@@ -468,8 +471,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
                              loopback, RGMII_IO_MACRO_CONFIG);
                break;
        default:
-               dev_err(&ethqos->pdev->dev,
-                       "Invalid speed %d\n", ethqos->speed);
+               dev_err(dev, "Invalid speed %d\n", ethqos->speed);
                return -EINVAL;
        }
 
@@ -478,6 +480,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
 
 static int ethqos_configure(struct qcom_ethqos *ethqos)
 {
+       struct device *dev = &ethqos->pdev->dev;
        volatile unsigned int dll_lock;
        unsigned int i, retry = 1000;
 
@@ -540,8 +543,7 @@ static int ethqos_configure(struct qcom_ethqos *ethqos)
                        retry--;
                } while (retry > 0);
                if (!retry)
-                       dev_err(&ethqos->pdev->dev,
-                               "Timeout while waiting for DLL lock\n");
+                       dev_err(dev, "Timeout while waiting for DLL lock\n");
        }
 
        if (ethqos->speed == SPEED_1000)
@@ -597,6 +599,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
        const struct ethqos_emac_driver_data *data;
        struct plat_stmmacenet_data *plat_dat;
        struct stmmac_resources stmmac_res;
+       struct device *dev = &pdev->dev;
        struct qcom_ethqos *ethqos;
        int ret;
 
@@ -606,13 +609,13 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
 
        plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
        if (IS_ERR(plat_dat)) {
-               dev_err(&pdev->dev, "dt configuration failed\n");
+               dev_err(dev, "dt configuration failed\n");
                return PTR_ERR(plat_dat);
        }
 
        plat_dat->clks_config = ethqos_clks_config;
 
-       ethqos = devm_kzalloc(&pdev->dev, sizeof(*ethqos), GFP_KERNEL);
+       ethqos = devm_kzalloc(dev, sizeof(*ethqos), GFP_KERNEL);
        if (!ethqos) {
                ret = -ENOMEM;
                goto out_config_dt;
@@ -625,13 +628,13 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
                goto out_config_dt;
        }
 
-       data = of_device_get_match_data(&pdev->dev);
+       data = of_device_get_match_data(dev);
        ethqos->por = data->por;
        ethqos->num_por = data->num_por;
        ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en;
        ethqos->has_emac3 = data->has_emac3;
 
-       ethqos->rgmii_clk = devm_clk_get(&pdev->dev, "rgmii");
+       ethqos->rgmii_clk = devm_clk_get(dev, "rgmii");
        if (IS_ERR(ethqos->rgmii_clk)) {
                ret = PTR_ERR(ethqos->rgmii_clk);
                goto out_config_dt;
@@ -641,7 +644,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
        if (ret)
                goto out_config_dt;
 
-       ret = devm_add_action_or_reset(&pdev->dev, ethqos_clks_disable, ethqos);
+       ret = devm_add_action_or_reset(dev, ethqos_clks_disable, ethqos);
        if (ret)
                goto out_config_dt;
 
@@ -660,7 +663,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
        if (of_device_is_compatible(np, "qcom,qcs404-ethqos"))
                plat_dat->rx_clk_runs_in_lpi = 1;
 
-       ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
+       ret = stmmac_dvr_probe(dev, plat_dat, &stmmac_res);
        if (ret)
                goto out_config_dt;