Commit 9d55cb3b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Daniel Lezcano

thermal/drivers/broadcom: Simplify with dev_err_probe()

Error handling in probe() can be a bit simpler with dev_err_probe().
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240709-thermal-probe-v1-3-241644e2b6e0@linaro.orgSigned-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent fd972a17
...@@ -186,12 +186,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) ...@@ -186,12 +186,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
} }
data->clk = devm_clk_get_enabled(dev, NULL); data->clk = devm_clk_get_enabled(dev, NULL);
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk))
err = PTR_ERR(data->clk); return dev_err_probe(dev, PTR_ERR(data->clk), "Could not get clk\n");
if (err != -EPROBE_DEFER)
dev_err(dev, "Could not get clk: %d\n", err);
return err;
}
rate = clk_get_rate(data->clk); rate = clk_get_rate(data->clk);
if ((rate < 1920000) || (rate > 5000000)) if ((rate < 1920000) || (rate > 5000000))
...@@ -201,11 +197,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev) ...@@ -201,11 +197,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
/* register of thermal sensor and get info from DT */ /* register of thermal sensor and get info from DT */
tz = devm_thermal_of_zone_register(dev, 0, data, &bcm2835_thermal_ops); tz = devm_thermal_of_zone_register(dev, 0, data, &bcm2835_thermal_ops);
if (IS_ERR(tz)) { if (IS_ERR(tz))
err = PTR_ERR(tz); return dev_err_probe(dev, PTR_ERR(tz), "Failed to register the thermal device\n");
dev_err(dev, "Failed to register the thermal device: %d\n", err);
return err;
}
/* /*
* right now the FW does set up the HW-block, so we are not * right now the FW does set up the HW-block, so we are not
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment