Skip to content

Commit ca61766

Browse files
krzkdlezcano
authored andcommitted
thermal/drivers/exynos: Simplify with dev_err_probe()
Error handling in probe() can be a bit simpler with dev_err_probe(). Signed-off-by: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Daniel Lezcano <[email protected]>
1 parent 4a6cf76 commit ca61766

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

drivers/thermal/samsung/exynos_tmu.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,17 +1037,14 @@ static int exynos_tmu_probe(struct platform_device *pdev)
10371037
return ret;
10381038

10391039
data->clk = devm_clk_get(dev, "tmu_apbif");
1040-
if (IS_ERR(data->clk)) {
1041-
dev_err(dev, "Failed to get clock\n");
1042-
return PTR_ERR(data->clk);
1043-
}
1040+
if (IS_ERR(data->clk))
1041+
return dev_err_probe(dev, PTR_ERR(data->clk), "Failed to get clock\n");
10441042

10451043
data->clk_sec = devm_clk_get(dev, "tmu_triminfo_apbif");
10461044
if (IS_ERR(data->clk_sec)) {
1047-
if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) {
1048-
dev_err(dev, "Failed to get triminfo clock\n");
1049-
return PTR_ERR(data->clk_sec);
1050-
}
1045+
if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO)
1046+
return dev_err_probe(dev, PTR_ERR(data->clk_sec),
1047+
"Failed to get triminfo clock\n");
10511048
} else {
10521049
ret = clk_prepare(data->clk_sec);
10531050
if (ret) {
@@ -1067,8 +1064,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
10671064
case SOC_ARCH_EXYNOS7:
10681065
data->sclk = devm_clk_get(dev, "tmu_sclk");
10691066
if (IS_ERR(data->sclk)) {
1070-
dev_err(dev, "Failed to get sclk\n");
1071-
ret = PTR_ERR(data->sclk);
1067+
ret = dev_err_probe(dev, PTR_ERR(data->sclk), "Failed to get sclk\n");
10721068
goto err_clk;
10731069
} else {
10741070
ret = clk_prepare_enable(data->sclk);
@@ -1091,9 +1087,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
10911087
data->tzd = devm_thermal_of_zone_register(dev, 0, data,
10921088
&exynos_sensor_ops);
10931089
if (IS_ERR(data->tzd)) {
1094-
ret = PTR_ERR(data->tzd);
1095-
if (ret != -EPROBE_DEFER)
1096-
dev_err(dev, "Failed to register sensor: %d\n", ret);
1090+
ret = dev_err_probe(dev, PTR_ERR(data->tzd), "Failed to register sensor\n");
10971091
goto err_sclk;
10981092
}
10991093

0 commit comments

Comments
 (0)