Merge remote-tracking branch 'torvalds/master' into perf/urgent

[linux-2.6-microblaze.git] / drivers / thermal / imx_thermal.c

diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c
index 3f74ab4..2c7473d 100644 (file)
--- a/drivers/thermal/imx_thermal.c
+++ b/drivers/thermal/imx_thermal.c
@@ -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)) {