Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

thermal/drivers/exynos: Simplify with dev_err_probe()

Browse Source 
Error handling in probe() can be a bit simpler with dev_err_probe().

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240709-thermal-probe-v1-5-241644e2b6e0@linaro.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2024-07-09 14:59:35 +02:00 committed by Daniel Lezcano
parent 4a6cf76edf
commit ca6176693f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/thermal/samsung/exynos_tmu.c
View File

@ -1037,17 +1037,14 @@ static int exynos_tmu_probe(struct platform_device *pdev)
return ret; return ret;
data->clk = devm_clk_get(dev, "tmu_apbif"); data->clk = devm_clk_get(dev, "tmu_apbif");
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk))
dev_err(dev, "Failed to get clock\n"); return dev_err_probe(dev, PTR_ERR(data->clk), "Failed to get clock\n");
return PTR_ERR(data->clk);
}
data->clk_sec = devm_clk_get(dev, "tmu_triminfo_apbif"); data->clk_sec = devm_clk_get(dev, "tmu_triminfo_apbif");
if (IS_ERR(data->clk_sec)) { if (IS_ERR(data->clk_sec)) {
if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) { if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO)
dev_err(dev, "Failed to get triminfo clock\n"); return dev_err_probe(dev, PTR_ERR(data->clk_sec),
return PTR_ERR(data->clk_sec); "Failed to get triminfo clock\n");
}
} else { } else {
ret = clk_prepare(data->clk_sec); ret = clk_prepare(data->clk_sec);
if (ret) { if (ret) {
@ -1067,8 +1064,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
case SOC_ARCH_EXYNOS7: case SOC_ARCH_EXYNOS7:
data->sclk = devm_clk_get(dev, "tmu_sclk"); data->sclk = devm_clk_get(dev, "tmu_sclk");
if (IS_ERR(data->sclk)) { if (IS_ERR(data->sclk)) {
dev_err(dev, "Failed to get sclk\n"); ret = dev_err_probe(dev, PTR_ERR(data->sclk), "Failed to get sclk\n");
ret = PTR_ERR(data->sclk);
goto err_clk; goto err_clk;
} else { } else {
ret = clk_prepare_enable(data->sclk); ret = clk_prepare_enable(data->sclk);
@ -1091,9 +1087,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
data->tzd = devm_thermal_of_zone_register(dev, 0, data, data->tzd = devm_thermal_of_zone_register(dev, 0, data,
&exynos_sensor_ops); &exynos_sensor_ops);
if (IS_ERR(data->tzd)) { if (IS_ERR(data->tzd)) {
ret = PTR_ERR(data->tzd); ret = dev_err_probe(dev, PTR_ERR(data->tzd), "Failed to register sensor\n");
if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to register sensor: %d\n", ret);
goto err_sclk; goto err_sclk;
} }