github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-29 17:43:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thermal/drivers/broadcom: 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-3-241644e2b6e0@linaro.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2024-07-09 14:59:33 +02:00 committed by Daniel Lezcano
parent fd972a1745
commit 9d55cb3ba3
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/thermal/broadcom/bcm2835_thermal.c
View File

@ -186,12 +186,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
}
data->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(data->clk)) {
err = PTR_ERR(data->clk);
if (err != -EPROBE_DEFER)
dev_err(dev, "Could not get clk: %d\n", err);
return err;
}
if (IS_ERR(data->clk))
return dev_err_probe(dev, PTR_ERR(data->clk), "Could not get clk\n");
rate = clk_get_rate(data->clk);
if ((rate < 1920000) || (rate > 5000000))
@ -201,11 +197,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
/* register of thermal sensor and get info from DT */
tz = devm_thermal_of_zone_register(dev, 0, data, &bcm2835_thermal_ops);
if (IS_ERR(tz)) {
err = PTR_ERR(tz);
dev_err(dev, "Failed to register the thermal device: %d\n", err);
return err;
}
if (IS_ERR(tz))
return dev_err_probe(dev, PTR_ERR(tz), "Failed to register the thermal device\n");
/*
* right now the FW does set up the HW-block, so we are not