Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Anson Huang <Anson.Huang@nxp.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/1597129185-8460-1-git-send-email-Anson.Huang@nxp.com

authored by

Anson Huang and committed by
Daniel Lezcano
5f3c0200 c071cde0

+6 -16
+6 -16
drivers/thermal/imx_thermal.c
··· 716 716 717 717 if (of_find_property(pdev->dev.of_node, "nvmem-cells", NULL)) { 718 718 ret = imx_init_from_nvmem_cells(pdev); 719 - if (ret) { 720 - if (ret == -EPROBE_DEFER) 721 - return ret; 722 - 723 - dev_err(&pdev->dev, "failed to init from nvmem: %d\n", 724 - ret); 725 - return ret; 726 - } 719 + if (ret) 720 + return dev_err_probe(&pdev->dev, ret, 721 + "failed to init from nvmem\n"); 727 722 } else { 728 723 ret = imx_init_from_tempmon_data(pdev); 729 724 if (ret) { ··· 741 746 data->socdata->power_down_mask); 742 747 743 748 ret = imx_thermal_register_legacy_cooling(data); 744 - if (ret) { 745 - if (ret == -EPROBE_DEFER) 746 - return ret; 747 - 748 - dev_err(&pdev->dev, 749 - "failed to register cpufreq cooling device: %d\n", ret); 750 - return ret; 751 - } 749 + if (ret) 750 + return dev_err_probe(&pdev->dev, ret, 751 + "failed to register cpufreq cooling device\n"); 752 752 753 753 data->thermal_clk = devm_clk_get(&pdev->dev, NULL); 754 754 if (IS_ERR(data->thermal_clk)) {