diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-12-21 15:49:12 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-21 15:49:12 +0100 |
| commit | 32c9edc4e356063e0218362d452a269cfa6798ee (patch) | |
| tree | 43982a1f642c7fedef1cc5f8c247b646582cbe03 /drivers/thermal/db8500_cpufreq_cooling.c | |
| parent | thermal/powerclamp: add ids for future xeon cpus (diff) | |
| parent | thermal: cpu_cooling: return ERR_PTR() for !CPU_THERMAL or !THERMAL_OF (diff) | |
| download | linux-32c9edc4e356063e0218362d452a269cfa6798ee.tar.xz linux-32c9edc4e356063e0218362d452a269cfa6798ee.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/db8500_cpufreq_cooling.c')
| -rw-r--r-- | drivers/thermal/db8500_cpufreq_cooling.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/thermal/db8500_cpufreq_cooling.c b/drivers/thermal/db8500_cpufreq_cooling.c index 000d53e934a0..607b62c7e611 100644 --- a/drivers/thermal/db8500_cpufreq_cooling.c +++ b/drivers/thermal/db8500_cpufreq_cooling.c @@ -18,7 +18,6 @@ */ #include <linux/cpu_cooling.h> -#include <linux/cpufreq.h> #include <linux/err.h> #include <linux/module.h> #include <linux/of.h> @@ -28,18 +27,17 @@ static int db8500_cpufreq_cooling_probe(struct platform_device *pdev) { struct thermal_cooling_device *cdev; - struct cpumask mask_val; - - /* make sure cpufreq driver has been initialized */ - if (!cpufreq_frequency_get_table(0)) - return -EPROBE_DEFER; - - cpumask_set_cpu(0, &mask_val); - cdev = cpufreq_cooling_register(&mask_val); + cdev = cpufreq_cooling_register(cpu_present_mask); if (IS_ERR(cdev)) { - dev_err(&pdev->dev, "Failed to register cooling device\n"); - return PTR_ERR(cdev); + int ret = PTR_ERR(cdev); + + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "Failed to register cooling device %d\n", + ret); + + return ret; } platform_set_drvdata(pdev, cdev); |