| Message ID | 20220915065043.665138-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | de0665c871b7cdcf5661649c6bc5b863ece94a35 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next,1/3] net: mdio: mux-meson-g12a: Switch to use dev_err_probe() helper | expand |
On Thu, Sep 15, 2022 at 02:50:41PM +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: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 15 Sep 2022 14:50:41 +0800 you 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> > --- > drivers/net/mdio/mdio-mux-meson-g12a.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) Here is the summary with links: - [-next,1/3] net: mdio: mux-meson-g12a: Switch to use dev_err_probe() helper https://git.kernel.org/netdev/net-next/c/de0665c871b7 - [-next,2/3] net: mdio: mux-mmioreg: Switch to use dev_err_probe() helper https://git.kernel.org/netdev/net-next/c/770aac8dc05d - [-next,3/3] net: mdio: mux-multiplexer: Switch to use dev_err_probe() helper https://git.kernel.org/netdev/net-next/c/4633b39183c5 You are awesome, thank you!
diff --git a/drivers/net/mdio/mdio-mux-meson-g12a.c b/drivers/net/mdio/mdio-mux-meson-g12a.c index b8866bc3f2e8..4a2e94faf57e 100644 --- a/drivers/net/mdio/mdio-mux-meson-g12a.c +++ b/drivers/net/mdio/mdio-mux-meson-g12a.c @@ -233,11 +233,9 @@ static int g12a_ephy_glue_clk_register(struct device *dev) snprintf(in_name, sizeof(in_name), "clkin%d", i); clk = devm_clk_get(dev, in_name); - if (IS_ERR(clk)) { - if (PTR_ERR(clk) != -EPROBE_DEFER) - dev_err(dev, "Missing clock %s\n", in_name); - return PTR_ERR(clk); - } + if (IS_ERR(clk)) + return dev_err_probe(dev, PTR_ERR(clk), + "Missing clock %s\n", in_name); parent_names[i] = __clk_get_name(clk); } @@ -317,12 +315,9 @@ static int g12a_mdio_mux_probe(struct platform_device *pdev) return PTR_ERR(priv->regs); priv->pclk = devm_clk_get(dev, "pclk"); - if (IS_ERR(priv->pclk)) { - ret = PTR_ERR(priv->pclk); - if (ret != -EPROBE_DEFER) - dev_err(dev, "failed to get peripheral clock\n"); - return ret; - } + if (IS_ERR(priv->pclk)) + return dev_err_probe(dev, PTR_ERR(priv->pclk), + "failed to get peripheral clock\n"); /* Make sure the device registers are clocked */ ret = clk_prepare_enable(priv->pclk); @@ -339,8 +334,7 @@ static int g12a_mdio_mux_probe(struct platform_device *pdev) ret = mdio_mux_init(dev, dev->of_node, g12a_mdio_switch_fn, &priv->mux_handle, dev, NULL); if (ret) { - if (ret != -EPROBE_DEFER) - dev_err(dev, "mdio multiplexer init failed: %d", ret); + dev_err_probe(dev, ret, "mdio multiplexer init failed\n"); goto err; }
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/mdio/mdio-mux-meson-g12a.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)