Commit 5f3c0200 authored by Anson Huang's avatar Anson Huang Committed by Daniel Lezcano
Browse files

thermal: imx: Use dev_err_probe() to simplify error handling 



dev_err_probe() can reduce code size, uniform error handling and record the
defer probe reason etc., use it to simplify the code.

Signed-off-by: default avatarAnson Huang <Anson.Huang@nxp.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/1597129185-8460-1-git-send-email-Anson.Huang@nxp.com
parent c071cde0

drivers/thermal/imx_thermal.c

+6 −16
Original line number Diff line number Diff line
@@ -716,14 +716,9 @@ static int imx_thermal_probe(struct platform_device *pdev) 


	if (of_find_property(pdev->dev.of_node, "nvmem-cells", NULL)) {

		ret = imx_init_from_nvmem_cells(pdev);

		if (ret) {

			if (ret == -EPROBE_DEFER)

				return ret;



			dev_err(&pdev->dev, "failed to init from nvmem: %d\n",

				ret);

			return ret;

		}

		if (ret)

			return dev_err_probe(&pdev->dev, ret,

					     "failed to init from nvmem\n");

	} else {

		ret = imx_init_from_tempmon_data(pdev);

		if (ret) {
@@ -746,14 +741,9 @@ static int imx_thermal_probe(struct platform_device *pdev) 
		     data->socdata->power_down_mask);



	ret = imx_thermal_register_legacy_cooling(data);

	if (ret) {

		if (ret == -EPROBE_DEFER)

			return ret;



		dev_err(&pdev->dev,

			"failed to register cpufreq cooling device: %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(&pdev->dev, ret,

				     "failed to register cpufreq cooling device\n");



	data->thermal_clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(data->thermal_clk)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE