Skip to content

L
linux
Commit 302555a0 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Jakub Kicinski
Browse files
Options

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: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 7b5e64a9
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 23 deletions
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
View file @ 302555a0
...@@ -123,25 +123,26 @@ static void rgmii_updatel(struct qcom_ethqos *ethqos, ...@@ -123,25 +123,26 @@ static void rgmii_updatel(struct qcom_ethqos *ethqos,
static void rgmii_dump(void *priv) static void rgmii_dump(void *priv)
{ {
struct qcom_ethqos *ethqos = priv; struct qcom_ethqos *ethqos = priv;
struct device *dev = &ethqos->pdev->dev;
dev_dbg(&ethqos->pdev->dev, "Rgmii register dump\n"); dev_dbg(dev, "Rgmii register dump\n");
dev_dbg(&ethqos->pdev->dev, "RGMII_IO_MACRO_CONFIG: %x\n", dev_dbg(dev, "RGMII_IO_MACRO_CONFIG: %x\n",
rgmii_readl(ethqos, RGMII_IO_MACRO_CONFIG)); 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)); 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)); 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)); 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)); 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)); 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)); 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)); 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)); rgmii_readl(ethqos, EMAC_SYSTEM_LOW_POWER_DEBUG));
} }
...@@ -242,6 +243,7 @@ static const struct ethqos_emac_driver_data emac_v3_0_0_data = { ...@@ -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) static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
{ {
struct device *dev = &ethqos->pdev->dev;
unsigned int val; unsigned int val;
int retry = 1000; int retry = 1000;
...@@ -279,7 +281,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos) ...@@ -279,7 +281,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
retry--; retry--;
} while (retry > 0); } while (retry > 0);
if (!retry) 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 */ /* Set CK_OUT_EN */
rgmii_updatel(ethqos, SDCC_DLL_CONFIG_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) ...@@ -296,7 +298,7 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
retry--; retry--;
} while (retry > 0); } while (retry > 0);
if (!retry) 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 */ /* Set DDR_CAL_EN */
rgmii_updatel(ethqos, SDCC_DLL_CONFIG2_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) ...@@ -322,12 +324,13 @@ static int ethqos_dll_configure(struct qcom_ethqos *ethqos)
static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
{ {
struct device *dev = &ethqos->pdev->dev;
int phase_shift; int phase_shift;
int phy_mode; int phy_mode;
int loopback; int loopback;
/* Determine if the PHY adds a 2 ns TX delay or the MAC handles it */ /* 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 || if (phy_mode == PHY_INTERFACE_MODE_RGMII_ID ||
phy_mode == PHY_INTERFACE_MODE_RGMII_TXID) phy_mode == PHY_INTERFACE_MODE_RGMII_TXID)
phase_shift = 0; phase_shift = 0;
...@@ -468,8 +471,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) ...@@ -468,8 +471,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
loopback, RGMII_IO_MACRO_CONFIG); loopback, RGMII_IO_MACRO_CONFIG);
break; break;
default: default:
dev_err(&ethqos->pdev->dev, dev_err(dev, "Invalid speed %d\n", ethqos->speed);
"Invalid speed %d\n", ethqos->speed);
return -EINVAL; return -EINVAL;
} }
...@@ -478,6 +480,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos) ...@@ -478,6 +480,7 @@ static int ethqos_rgmii_macro_init(struct qcom_ethqos *ethqos)
static int ethqos_configure(struct qcom_ethqos *ethqos) static int ethqos_configure(struct qcom_ethqos *ethqos)
{ {
struct device *dev = &ethqos->pdev->dev;
volatile unsigned int dll_lock; volatile unsigned int dll_lock;
unsigned int i, retry = 1000; unsigned int i, retry = 1000;
...@@ -540,8 +543,7 @@ static int ethqos_configure(struct qcom_ethqos *ethqos) ...@@ -540,8 +543,7 @@ static int ethqos_configure(struct qcom_ethqos *ethqos)
retry--; retry--;
} while (retry > 0); } while (retry > 0);
if (!retry) if (!retry)
dev_err(&ethqos->pdev->dev, dev_err(dev, "Timeout while waiting for DLL lock\n");
"Timeout while waiting for DLL lock\n");
} }
if (ethqos->speed == SPEED_1000) if (ethqos->speed == SPEED_1000)
...@@ -597,6 +599,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -597,6 +599,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
const struct ethqos_emac_driver_data *data; const struct ethqos_emac_driver_data *data;
struct plat_stmmacenet_data *plat_dat; struct plat_stmmacenet_data *plat_dat;
struct stmmac_resources stmmac_res; struct stmmac_resources stmmac_res;
struct device *dev = &pdev->dev;
struct qcom_ethqos *ethqos; struct qcom_ethqos *ethqos;
int ret; int ret;
...@@ -606,13 +609,13 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -606,13 +609,13 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
if (IS_ERR(plat_dat)) { 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); return PTR_ERR(plat_dat);
} }
plat_dat->clks_config = ethqos_clks_config; 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) { if (!ethqos) {
ret = -ENOMEM; ret = -ENOMEM;
goto out_config_dt; goto out_config_dt;
...@@ -625,13 +628,13 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -625,13 +628,13 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
goto out_config_dt; goto out_config_dt;
} }
data = of_device_get_match_data(&pdev->dev); data = of_device_get_match_data(dev);
ethqos->por = data->por; ethqos->por = data->por;
ethqos->num_por = data->num_por; ethqos->num_por = data->num_por;
ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en; ethqos->rgmii_config_loopback_en = data->rgmii_config_loopback_en;
ethqos->has_emac3 = data->has_emac3; 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)) { if (IS_ERR(ethqos->rgmii_clk)) {
ret = PTR_ERR(ethqos->rgmii_clk); ret = PTR_ERR(ethqos->rgmii_clk);
goto out_config_dt; goto out_config_dt;
...@@ -641,7 +644,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -641,7 +644,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
if (ret) if (ret)
goto out_config_dt; 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) if (ret)
goto out_config_dt; goto out_config_dt;
...@@ -660,7 +663,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev) ...@@ -660,7 +663,7 @@ static int qcom_ethqos_probe(struct platform_device *pdev)
if (of_device_is_compatible(np, "qcom,qcs404-ethqos")) if (of_device_is_compatible(np, "qcom,qcs404-ethqos"))
plat_dat->rx_clk_runs_in_lpi = 1; 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) if (ret)
goto out_config_dt; goto out_config_dt;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7