Skip to content

Commit 5c05a33

Browse files
Yang Yingliangjernejsk
authored andcommitted
clk: sunxi-ng: sun8i-de2: 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 <[email protected]> Reviewed-by: Jernej Skrabec <[email protected]> Signed-off-by: Jernej Skrabec <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 3930624 commit 5c05a33

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

drivers/clk/sunxi-ng/ccu-sun8i-de2.c

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -256,29 +256,19 @@ static int sunxi_de2_clk_probe(struct platform_device *pdev)
256256
return PTR_ERR(reg);
257257

258258
bus_clk = devm_clk_get(&pdev->dev, "bus");
259-
if (IS_ERR(bus_clk)) {
260-
ret = PTR_ERR(bus_clk);
261-
if (ret != -EPROBE_DEFER)
262-
dev_err(&pdev->dev, "Couldn't get bus clk: %d\n", ret);
263-
return ret;
264-
}
259+
if (IS_ERR(bus_clk))
260+
return dev_err_probe(&pdev->dev, PTR_ERR(bus_clk),
261+
"Couldn't get bus clk\n");
265262

266263
mod_clk = devm_clk_get(&pdev->dev, "mod");
267-
if (IS_ERR(mod_clk)) {
268-
ret = PTR_ERR(mod_clk);
269-
if (ret != -EPROBE_DEFER)
270-
dev_err(&pdev->dev, "Couldn't get mod clk: %d\n", ret);
271-
return ret;
272-
}
264+
if (IS_ERR(mod_clk))
265+
return dev_err_probe(&pdev->dev, PTR_ERR(mod_clk),
266+
"Couldn't get mod clk\n");
273267

274268
rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
275-
if (IS_ERR(rstc)) {
276-
ret = PTR_ERR(rstc);
277-
if (ret != -EPROBE_DEFER)
278-
dev_err(&pdev->dev,
279-
"Couldn't get reset control: %d\n", ret);
280-
return ret;
281-
}
269+
if (IS_ERR(rstc))
270+
return dev_err_probe(&pdev->dev, PTR_ERR(rstc),
271+
"Couldn't get reset control\n");
282272

283273
/* The clocks need to be enabled for us to access the registers */
284274
ret = clk_prepare_enable(bus_clk);

0 commit comments

Comments
 (0)