Skip to content

L
linux
Commit d42202dc authored by Romain Perier's avatar Romain Perier Committed by David S. Miller
Browse files
Options

net: stmmac: dwmac-rk: Don't add function name in info or err messages 

These kind of informations are only useful for debugging and should not be
displayed in normal modules message.
Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89d256bb
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 39 deletions
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
View file @ d42202dc
...@@ -98,7 +98,7 @@ static void set_to_rgmii(struct rk_priv_data *bsp_priv, ...@@ -98,7 +98,7 @@ static void set_to_rgmii(struct rk_priv_data *bsp_priv,
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
if (IS_ERR(bsp_priv->grf)) { if (IS_ERR(bsp_priv->grf)) {
dev_err(dev, "%s: Missing rockchip,grf property\n", __func__); dev_err(dev, "Missing rockchip,grf property\n");
return; return;
} }
...@@ -115,7 +115,7 @@ static void set_to_rmii(struct rk_priv_data *bsp_priv) ...@@ -115,7 +115,7 @@ static void set_to_rmii(struct rk_priv_data *bsp_priv)
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
if (IS_ERR(bsp_priv->grf)) { if (IS_ERR(bsp_priv->grf)) {
dev_err(dev, "%s: Missing rockchip,grf property\n", __func__); dev_err(dev, "Missing rockchip,grf property\n");
return; return;
} }
...@@ -128,7 +128,7 @@ static void set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed) ...@@ -128,7 +128,7 @@ static void set_rgmii_speed(struct rk_priv_data *bsp_priv, int speed)
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
if (IS_ERR(bsp_priv->grf)) { if (IS_ERR(bsp_priv->grf)) {
dev_err(dev, "%s: Missing rockchip,grf property\n", __func__); dev_err(dev, "Missing rockchip,grf property\n");
return; return;
} }
...@@ -147,7 +147,7 @@ static void set_rmii_speed(struct rk_priv_data *bsp_priv, int speed) ...@@ -147,7 +147,7 @@ static void set_rmii_speed(struct rk_priv_data *bsp_priv, int speed)
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
if (IS_ERR(bsp_priv->grf)) { if (IS_ERR(bsp_priv->grf)) {
dev_err(dev, "%s: Missing rockchip,grf property\n", __func__); dev_err(dev, "Missing rockchip,grf property\n");
return; return;
} }
...@@ -170,46 +170,46 @@ static int gmac_clk_init(struct rk_priv_data *bsp_priv) ...@@ -170,46 +170,46 @@ static int gmac_clk_init(struct rk_priv_data *bsp_priv)
bsp_priv->mac_clk_rx = devm_clk_get(dev, "mac_clk_rx"); bsp_priv->mac_clk_rx = devm_clk_get(dev, "mac_clk_rx");
if (IS_ERR(bsp_priv->mac_clk_rx)) if (IS_ERR(bsp_priv->mac_clk_rx))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "mac_clk_rx"); "mac_clk_rx");
bsp_priv->mac_clk_tx = devm_clk_get(dev, "mac_clk_tx"); bsp_priv->mac_clk_tx = devm_clk_get(dev, "mac_clk_tx");
if (IS_ERR(bsp_priv->mac_clk_tx)) if (IS_ERR(bsp_priv->mac_clk_tx))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "mac_clk_tx"); "mac_clk_tx");
bsp_priv->aclk_mac = devm_clk_get(dev, "aclk_mac"); bsp_priv->aclk_mac = devm_clk_get(dev, "aclk_mac");
if (IS_ERR(bsp_priv->aclk_mac)) if (IS_ERR(bsp_priv->aclk_mac))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "aclk_mac"); "aclk_mac");
bsp_priv->pclk_mac = devm_clk_get(dev, "pclk_mac"); bsp_priv->pclk_mac = devm_clk_get(dev, "pclk_mac");
if (IS_ERR(bsp_priv->pclk_mac)) if (IS_ERR(bsp_priv->pclk_mac))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "pclk_mac"); "pclk_mac");
bsp_priv->clk_mac = devm_clk_get(dev, "stmmaceth"); bsp_priv->clk_mac = devm_clk_get(dev, "stmmaceth");
if (IS_ERR(bsp_priv->clk_mac)) if (IS_ERR(bsp_priv->clk_mac))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "stmmaceth"); "stmmaceth");
if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) { if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) {
bsp_priv->clk_mac_ref = devm_clk_get(dev, "clk_mac_ref"); bsp_priv->clk_mac_ref = devm_clk_get(dev, "clk_mac_ref");
if (IS_ERR(bsp_priv->clk_mac_ref)) if (IS_ERR(bsp_priv->clk_mac_ref))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "clk_mac_ref"); "clk_mac_ref");
if (!bsp_priv->clock_input) { if (!bsp_priv->clock_input) {
bsp_priv->clk_mac_refout = bsp_priv->clk_mac_refout =
devm_clk_get(dev, "clk_mac_refout"); devm_clk_get(dev, "clk_mac_refout");
if (IS_ERR(bsp_priv->clk_mac_refout)) if (IS_ERR(bsp_priv->clk_mac_refout))
dev_err(dev, "%s: cannot get clock %s\n", dev_err(dev, "cannot get clock %s\n",
__func__, "clk_mac_refout"); "clk_mac_refout");
} }
} }
if (bsp_priv->clock_input) { if (bsp_priv->clock_input) {
dev_info(dev, "%s: clock input from PHY\n", __func__); dev_info(dev, "clock input from PHY\n");
} else { } else {
if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII)
clk_set_rate(bsp_priv->clk_mac_pll, 50000000); clk_set_rate(bsp_priv->clk_mac_pll, 50000000);
...@@ -296,20 +296,18 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable) ...@@ -296,20 +296,18 @@ static int phy_power_on(struct rk_priv_data *bsp_priv, bool enable)
struct device *dev = &bsp_priv->pdev->dev; struct device *dev = &bsp_priv->pdev->dev;
if (!ldo) { if (!ldo) {
dev_err(dev, "%s: no regulator found\n", __func__); dev_err(dev, "no regulator found\n");
return -1; return -1;
} }
if (enable) { if (enable) {
ret = regulator_enable(ldo); ret = regulator_enable(ldo);
if (ret) if (ret)
dev_err(dev, "%s: fail to enable phy-supply\n", dev_err(dev, "fail to enable phy-supply\n");
__func__);
} else { } else {
ret = regulator_disable(ldo); ret = regulator_disable(ldo);
if (ret) if (ret)
dev_err(dev, "%s: fail to disable phy-supply\n", dev_err(dev, "fail to disable phy-supply\n");
__func__);
} }
return 0; return 0;
...@@ -341,12 +339,11 @@ static void *rk_gmac_setup(struct platform_device *pdev) ...@@ -341,12 +339,11 @@ static void *rk_gmac_setup(struct platform_device *pdev)
ret = of_property_read_string(dev->of_node, "clock_in_out", &strings); ret = of_property_read_string(dev->of_node, "clock_in_out", &strings);
if (ret) { if (ret) {
dev_err(dev, "%s: Can not read property: clock_in_out.\n", dev_err(dev, "Can not read property: clock_in_out.\n");
__func__);
bsp_priv->clock_input = true; bsp_priv->clock_input = true;
} else { } else {
dev_info(dev, "%s: clock input or output? (%s).\n", dev_info(dev, "clock input or output? (%s).\n",
__func__, strings); strings);
if (!strcmp(strings, "input")) if (!strcmp(strings, "input"))
bsp_priv->clock_input = true; bsp_priv->clock_input = true;
else else
...@@ -356,22 +353,22 @@ static void *rk_gmac_setup(struct platform_device *pdev) ...@@ -356,22 +353,22 @@ static void *rk_gmac_setup(struct platform_device *pdev)
ret = of_property_read_u32(dev->of_node, "tx_delay", &value); ret = of_property_read_u32(dev->of_node, "tx_delay", &value);
if (ret) { if (ret) {
bsp_priv->tx_delay = 0x30; bsp_priv->tx_delay = 0x30;
dev_err(dev, "%s: Can not read property: tx_delay.", __func__); dev_err(dev, "Can not read property: tx_delay.");
dev_err(dev, "%s: set tx_delay to 0x%x\n", dev_err(dev, "set tx_delay to 0x%x\n",
__func__, bsp_priv->tx_delay); bsp_priv->tx_delay);
} else { } else {
dev_info(dev, "%s: TX delay(0x%x).\n", __func__, value); dev_info(dev, "TX delay(0x%x).\n", value);
bsp_priv->tx_delay = value; bsp_priv->tx_delay = value;
} }
ret = of_property_read_u32(dev->of_node, "rx_delay", &value); ret = of_property_read_u32(dev->of_node, "rx_delay", &value);
if (ret) { if (ret) {
bsp_priv->rx_delay = 0x10; bsp_priv->rx_delay = 0x10;
dev_err(dev, "%s: Can not read property: rx_delay.", __func__); dev_err(dev, "Can not read property: rx_delay.");
dev_err(dev, "%s: set rx_delay to 0x%x\n", dev_err(dev, "set rx_delay to 0x%x\n",
__func__, bsp_priv->rx_delay); bsp_priv->rx_delay);
} else { } else {
dev_info(dev, "%s: RX delay(0x%x).\n", __func__, value); dev_info(dev, "RX delay(0x%x).\n", value);
bsp_priv->rx_delay = value; bsp_priv->rx_delay = value;
} }
...@@ -381,13 +378,13 @@ static void *rk_gmac_setup(struct platform_device *pdev) ...@@ -381,13 +378,13 @@ static void *rk_gmac_setup(struct platform_device *pdev)
/*rmii or rgmii*/ /*rmii or rgmii*/
if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) { if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RGMII) {
dev_info(dev, "%s: init for RGMII\n", __func__); dev_info(dev, "init for RGMII\n");
set_to_rgmii(bsp_priv, bsp_priv->tx_delay, bsp_priv->rx_delay); set_to_rgmii(bsp_priv, bsp_priv->tx_delay, bsp_priv->rx_delay);
} else if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) { } else if (bsp_priv->phy_iface == PHY_INTERFACE_MODE_RMII) {
dev_info(dev, "%s: init for RMII\n", __func__); dev_info(dev, "init for RMII\n");
set_to_rmii(bsp_priv); set_to_rmii(bsp_priv);
} else { } else {
dev_err(dev, "%s: NO interface defined!\n", __func__); dev_err(dev, "NO interface defined!\n");
} }
gmac_clk_init(bsp_priv); gmac_clk_init(bsp_priv);
......
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