aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Valentin <edubezval@gmail.com>2014-12-12 09:05:39 -0500
committerEduardo Valentin <edubezval@gmail.com>2014-12-12 09:08:31 -0500
commitcffafc3247356088babff01201478c3c7adaef3f (patch)
tree3fc5d111b726553b1d2552448a6b00c28d507e70
parent38cbf0414ce9f3403fd0a8f508117cb637d693db (diff)
thermal: ti-soc-thermal: Do not print error message in the EPROBE_DEFER case
Avoid printing the error message in the EPROBE_DEFER case where registering cpu cooling at ti-soc-thermal thermal driver. Cc: Zhang Rui <rui.zhang@intel.com> Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
-rw-r--r--drivers/thermal/ti-soc-thermal/ti-thermal-common.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index 5f07d7e3a198..096fb2141b28 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@ -405,9 +405,14 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
405 /* Register cooling device */ 405 /* Register cooling device */
406 data->cool_dev = cpufreq_cooling_register(cpu_present_mask); 406 data->cool_dev = cpufreq_cooling_register(cpu_present_mask);
407 if (IS_ERR(data->cool_dev)) { 407 if (IS_ERR(data->cool_dev)) {
408 dev_err(bgp->dev, 408 int ret = PTR_ERR(data->cool_dev);
409 "Failed to register cpufreq cooling device\n"); 409
410 return PTR_ERR(data->cool_dev); 410 if (ret != -EPROBE_DEFER)
411 dev_err(bgp->dev,
412 "Failed to register cpu cooling device %d\n",
413 ret);
414
415 return ret;
411 } 416 }
412 ti_bandgap_set_sensor_data(bgp, id, data); 417 ti_bandgap_set_sensor_data(bgp, id, data);
413 418