All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper
@ 2022-09-15 11:42 Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 1/7] net: ethernet: ti: am65-cpts: " Yang Yingliang
                   ` (7 more replies)
  0 siblings, 8 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

In the probe path, dev_err() can be replace with dev_err_probe()
which will check if error code is -EPROBE_DEFER. It will print
error code in a human readable way and simplify the code.

Yang Yingliang (7):
  net: ethernet: ti: am65-cpts: Switch to use dev_err_probe() helper
  net: ethernet: ti: cpsw: Switch to use dev_err_probe() helper
  net: ethernet: ti: cpsw_new: Switch to use dev_err_probe() helper
  net: dsa: lantiq: Switch to use dev_err_probe() helper
  net: ibm: emac: Switch to use dev_err_probe() helper
  net: stmmac: dwc-qos: Switch to use dev_err_probe() helper
  net: ll_temac: Switch to use dev_err_probe() helper

 drivers/net/dsa/lantiq_gswip.c                   |  8 +++-----
 drivers/net/ethernet/ibm/emac/core.c             |  8 +++-----
 .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c  |  4 +---
 drivers/net/ethernet/ti/am65-cpts.c              |  7 ++-----
 drivers/net/ethernet/ti/cpsw.c                   |  3 +--
 drivers/net/ethernet/ti/cpsw_new.c               |  5 ++---
 drivers/net/ethernet/xilinx/ll_temac_main.c      | 16 ++++++----------
 7 files changed, 18 insertions(+), 33 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 10+ messages in thread
* [PATCH -next 1/7] net: ethernet: ti: am65-cpts: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 2/7] net: ethernet: ti: cpsw: " Yang Yingliang
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/ti/am65-cpts.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/ti/am65-cpts.c b/drivers/net/ethernet/ti/am65-cpts.c
index c30a6e510aa3..e2f0fb286143 100644
--- a/drivers/net/ethernet/ti/am65-cpts.c
+++ b/drivers/net/ethernet/ti/am65-cpts.c
@@ -943,9 +943,7 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 	cpts->irq = of_irq_get_byname(node, "cpts");
 	if (cpts->irq <= 0) {
 		ret = cpts->irq ?: -ENXIO;
-		if (ret != -EPROBE_DEFER)
-			dev_err(dev, "Failed to get IRQ number (err = %d)\n",
-				ret);
+		dev_err_probe(dev, ret, "Failed to get IRQ number\n");
 		return ERR_PTR(ret);
 	}
 
@@ -965,8 +963,7 @@ struct am65_cpts *am65_cpts_create(struct device *dev, void __iomem *regs,
 	cpts->refclk = devm_get_clk_from_child(dev, node, "cpts");
 	if (IS_ERR(cpts->refclk)) {
 		ret = PTR_ERR(cpts->refclk);
-		if (ret != -EPROBE_DEFER)
-			dev_err(dev, "Failed to get refclk %d\n", ret);
+		dev_err_probe(dev, ret, "Failed to get refclk\n");
 		return ERR_PTR(ret);
 	}
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH -next 2/7] net: ethernet: ti: cpsw: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 1/7] net: ethernet: ti: am65-cpts: " Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 3/7] net: ethernet: ti: cpsw_new: " Yang Yingliang
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/ti/cpsw.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 312250c642bb..99be1228a4e0 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1319,8 +1319,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 			 */
 			ret = of_phy_register_fixed_link(slave_node);
 			if (ret) {
-				if (ret != -EPROBE_DEFER)
-					dev_err(&pdev->dev, "failed to register fixed-link phy: %d\n", ret);
+				dev_err_probe(&pdev->dev, ret, "failed to register fixed-link phy\n");
 				goto err_node_put;
 			}
 			slave_data->phy_node = of_node_get(slave_node);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH -next 3/7] net: ethernet: ti: cpsw_new: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 1/7] net: ethernet: ti: am65-cpts: " Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 2/7] net: ethernet: ti: cpsw: " Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 4/7] net: dsa: lantiq: " Yang Yingliang
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/ti/cpsw_new.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c
index 007de15179f0..14fd90da32fd 100644
--- a/drivers/net/ethernet/ti/cpsw_new.c
+++ b/drivers/net/ethernet/ti/cpsw_new.c
@@ -1288,9 +1288,8 @@ static int cpsw_probe_dt(struct cpsw_common *cpsw)
 		if (of_phy_is_fixed_link(port_np)) {
 			ret = of_phy_register_fixed_link(port_np);
 			if (ret) {
-				if (ret != -EPROBE_DEFER)
-					dev_err(dev, "%pOF failed to register fixed-link phy: %d\n",
-						port_np, ret);
+				dev_err_probe(dev, ret, "%pOF failed to register fixed-link phy\n",
+					      port_np);
 				goto err_node_put;
 			}
 			slave_data->phy_node = of_node_get(port_np);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH -next 4/7] net: dsa: lantiq: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
                   ` (2 preceding siblings ...)
  2022-09-15 11:42 ` [PATCH -next 3/7] net: ethernet: ti: cpsw_new: " Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-20 23:49   ` Vladimir Oltean
  2022-09-15 11:42 ` [PATCH -next 5/7] net: ibm: emac: " Yang Yingliang
                   ` (3 subsequent siblings)
  7 siblings, 1 reply; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/dsa/lantiq_gswip.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c
index e531b93f3cb2..88f95d6e41c9 100644
--- a/drivers/net/dsa/lantiq_gswip.c
+++ b/drivers/net/dsa/lantiq_gswip.c
@@ -1989,11 +1989,9 @@ static int gswip_gphy_fw_probe(struct gswip_priv *priv,
 	}
 
 	gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);
-	if (IS_ERR(gphy_fw->reset)) {
-		if (PTR_ERR(gphy_fw->reset) != -EPROBE_DEFER)
-			dev_err(dev, "Failed to lookup gphy reset\n");
-		return PTR_ERR(gphy_fw->reset);
-	}
+	if (IS_ERR(gphy_fw->reset))
+		return dev_err_probe(dev, PTR_ERR(gphy_fw->reset),
+				     "Failed to lookup gphy reset\n");
 
 	return gswip_gphy_fw_load(priv, gphy_fw);
 }
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH -next 5/7] net: ibm: emac: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
                   ` (3 preceding siblings ...)
  2022-09-15 11:42 ` [PATCH -next 4/7] net: dsa: lantiq: " Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 6/7] net: stmmac: dwc-qos: " Yang Yingliang
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/ibm/emac/core.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c
index 0a4d04a8825d..9b08e41ccc29 100644
--- a/drivers/net/ethernet/ibm/emac/core.c
+++ b/drivers/net/ethernet/ibm/emac/core.c
@@ -2979,11 +2979,9 @@ static int emac_init_config(struct emac_instance *dev)
 
 	/* Read MAC-address */
 	err = of_get_ethdev_address(np, dev->ndev);
-	if (err) {
-		if (err != -EPROBE_DEFER)
-			dev_err(&dev->ofdev->dev, "Can't get valid [local-]mac-address from OF !\n");
-		return err;
-	}
+	if (err)
+		return dev_err_probe(&dev->ofdev->dev, err,
+				     "Can't get valid [local-]mac-address from OF !\n");
 
 	/* IAHT and GAHT filter parameterization */
 	if (emac_has_feature(dev, EMAC_FTR_EMAC4SYNC)) {
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH -next 6/7] net: stmmac: dwc-qos: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
                   ` (4 preceding siblings ...)
  2022-09-15 11:42 ` [PATCH -next 5/7] net: ibm: emac: " Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-15 11:42 ` [PATCH -next 7/7] net: ll_temac: " Yang Yingliang
  2022-09-21 13:20 ` [PATCH -next 0/7] net: drivers: " patchwork-bot+netdevbpf
  7 siblings, 0 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
index 358fc26f8d1f..80efdeeb0b59 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
@@ -445,9 +445,7 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)
 
 	ret = data->probe(pdev, plat_dat, &stmmac_res);
 	if (ret < 0) {
-		if (ret != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "failed to probe subdriver: %d\n",
-				ret);
+		dev_err_probe(&pdev->dev, ret, "failed to probe subdriver\n");
 
 		goto remove_config;
 	}
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [PATCH -next 7/7] net: ll_temac: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
                   ` (5 preceding siblings ...)
  2022-09-15 11:42 ` [PATCH -next 6/7] net: stmmac: dwc-qos: " Yang Yingliang
@ 2022-09-15 11:42 ` Yang Yingliang
  2022-09-21 13:20 ` [PATCH -next 0/7] net: drivers: " patchwork-bot+netdevbpf
  7 siblings, 0 replies; 10+ messages in thread
From: Yang Yingliang @ 2022-09-15 11:42 UTC (permalink / raw)
  To: netdev; +Cc: davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

dev_err() can be replace with dev_err_probe() which will check if error
code is -EPROBE_DEFER.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/net/ethernet/xilinx/ll_temac_main.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 3f6b9dfca095..c090068dc60e 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1563,16 +1563,12 @@ static int temac_probe(struct platform_device *pdev)
 	}
 
 	/* Error handle returned DMA RX and TX interrupts */
-	if (lp->rx_irq < 0) {
-		if (lp->rx_irq != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "could not get DMA RX irq\n");
-		return lp->rx_irq;
-	}
-	if (lp->tx_irq < 0) {
-		if (lp->tx_irq != -EPROBE_DEFER)
-			dev_err(&pdev->dev, "could not get DMA TX irq\n");
-		return lp->tx_irq;
-	}
+	if (lp->rx_irq < 0)
+		return dev_err_probe(&pdev->dev, lp->rx_irq,
+				     "could not get DMA RX irq\n");
+	if (lp->tx_irq < 0)
+		return dev_err_probe(&pdev->dev, lp->tx_irq,
+				     "could not get DMA TX irq\n");
 
 	if (temac_np) {
 		/* Retrieve the MAC address */
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH -next 4/7] net: dsa: lantiq: Switch to use dev_err_probe() helper
  2022-09-15 11:42 ` [PATCH -next 4/7] net: dsa: lantiq: " Yang Yingliang
@ 2022-09-20 23:49   ` Vladimir Oltean
  0 siblings, 0 replies; 10+ messages in thread
From: Vladimir Oltean @ 2022-09-20 23:49 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: netdev, davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

On Thu, Sep 15, 2022 at 07:42:11PM +0800, Yang Yingliang wrote:
> dev_err() can be replace with dev_err_probe() which will check if error
> code is -EPROBE_DEFER.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---

Reviewed-by: Vladimir Oltean <olteanv@gmail.com>

^ permalink raw reply	[flat|nested] 10+ messages in thread
* Re: [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper
  2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
                   ` (6 preceding siblings ...)
  2022-09-15 11:42 ` [PATCH -next 7/7] net: ll_temac: " Yang Yingliang
@ 2022-09-21 13:20 ` patchwork-bot+netdevbpf
  7 siblings, 0 replies; 10+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-09-21 13:20 UTC (permalink / raw)
  To: Yang Yingliang
  Cc: netdev, davem, kuba, hauke, andrew, peppe.cavallaro, alexandre.torgue

Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Thu, 15 Sep 2022 19:42:07 +0800 you wrote:
> In the probe path, dev_err() can be replace with dev_err_probe()
> which will check if error code is -EPROBE_DEFER. It will print
> error code in a human readable way and simplify the code.
> 
> Yang Yingliang (7):
>   net: ethernet: ti: am65-cpts: Switch to use dev_err_probe() helper
>   net: ethernet: ti: cpsw: Switch to use dev_err_probe() helper
>   net: ethernet: ti: cpsw_new: Switch to use dev_err_probe() helper
>   net: dsa: lantiq: Switch to use dev_err_probe() helper
>   net: ibm: emac: Switch to use dev_err_probe() helper
>   net: stmmac: dwc-qos: Switch to use dev_err_probe() helper
>   net: ll_temac: Switch to use dev_err_probe() helper
> 
> [...]

Here is the summary with links:
  - [-next,1/7] net: ethernet: ti: am65-cpts: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/e2baa12608d4
  - [-next,2/7] net: ethernet: ti: cpsw: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/102947f9bb92
  - [-next,3/7] net: ethernet: ti: cpsw_new: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/2c22e42edc8d
  - [-next,4/7] net: dsa: lantiq: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/d02bb8bef457
  - [-next,5/7] net: ibm: emac: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/b6dc230fba4b
  - [-next,6/7] net: stmmac: dwc-qos: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/c222cd27dd96
  - [-next,7/7] net: ll_temac: Switch to use dev_err_probe() helper
    https://git.kernel.org/netdev/net-next/c/75ae8c284c00

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-09-21 13:20 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-15 11:42 [PATCH -next 0/7] net: drivers: Switch to use dev_err_probe() helper Yang Yingliang
2022-09-15 11:42 ` [PATCH -next 1/7] net: ethernet: ti: am65-cpts: " Yang Yingliang
2022-09-15 11:42 ` [PATCH -next 2/7] net: ethernet: ti: cpsw: " Yang Yingliang
2022-09-15 11:42 ` [PATCH -next 3/7] net: ethernet: ti: cpsw_new: " Yang Yingliang
2022-09-15 11:42 ` [PATCH -next 4/7] net: dsa: lantiq: " Yang Yingliang
2022-09-20 23:49   ` Vladimir Oltean
2022-09-15 11:42 ` [PATCH -next 5/7] net: ibm: emac: " Yang Yingliang
2022-09-15 11:42 ` [PATCH -next 6/7] net: stmmac: dwc-qos: " Yang Yingliang
2022-09-15 11:42 ` [PATCH -next 7/7] net: ll_temac: " Yang Yingliang
2022-09-21 13:20 ` [PATCH -next 0/7] net: drivers: " patchwork-bot+netdevbpf

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.