Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: mdio: mux-meson-g12a: Switch to use dev_err_probe() helper

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>
Link: https://lore.kernel.org/r/20220915065043.665138-1-yangyingliang@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Yang Yingliang and committed by
Jakub Kicinski
de0665c8 1089877a

+7 -13
+7 -13
drivers/net/mdio/mdio-mux-meson-g12a.c
··· 233 233 234 234 snprintf(in_name, sizeof(in_name), "clkin%d", i); 235 235 clk = devm_clk_get(dev, in_name); 236 - if (IS_ERR(clk)) { 237 - if (PTR_ERR(clk) != -EPROBE_DEFER) 238 - dev_err(dev, "Missing clock %s\n", in_name); 239 - return PTR_ERR(clk); 240 - } 236 + if (IS_ERR(clk)) 237 + return dev_err_probe(dev, PTR_ERR(clk), 238 + "Missing clock %s\n", in_name); 241 239 242 240 parent_names[i] = __clk_get_name(clk); 243 241 } ··· 315 317 return PTR_ERR(priv->regs); 316 318 317 319 priv->pclk = devm_clk_get(dev, "pclk"); 318 - if (IS_ERR(priv->pclk)) { 319 - ret = PTR_ERR(priv->pclk); 320 - if (ret != -EPROBE_DEFER) 321 - dev_err(dev, "failed to get peripheral clock\n"); 322 - return ret; 323 - } 320 + if (IS_ERR(priv->pclk)) 321 + return dev_err_probe(dev, PTR_ERR(priv->pclk), 322 + "failed to get peripheral clock\n"); 324 323 325 324 /* Make sure the device registers are clocked */ 326 325 ret = clk_prepare_enable(priv->pclk); ··· 334 339 ret = mdio_mux_init(dev, dev->of_node, g12a_mdio_switch_fn, 335 340 &priv->mux_handle, dev, NULL); 336 341 if (ret) { 337 - if (ret != -EPROBE_DEFER) 338 - dev_err(dev, "mdio multiplexer init failed: %d", ret); 342 + dev_err_probe(dev, ret, "mdio multiplexer init failed\n"); 339 343 goto err; 340 344 } 341 345