diff options
Diffstat (limited to 'drivers/thermal/cpu_cooling.c')
-rw-r--r-- | drivers/thermal/cpu_cooling.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 6ceac4f2d4b2..5b4b47ed948b 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c | |||
@@ -857,14 +857,6 @@ __cpufreq_cooling_register(struct device_node *np, | |||
857 | goto free_power_table; | 857 | goto free_power_table; |
858 | } | 858 | } |
859 | 859 | ||
860 | snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d", | ||
861 | cpufreq_dev->id); | ||
862 | |||
863 | cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev, | ||
864 | &cpufreq_cooling_ops); | ||
865 | if (IS_ERR(cool_dev)) | ||
866 | goto remove_idr; | ||
867 | |||
868 | /* Fill freq-table in descending order of frequencies */ | 860 | /* Fill freq-table in descending order of frequencies */ |
869 | for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) { | 861 | for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) { |
870 | freq = find_next_max(table, freq); | 862 | freq = find_next_max(table, freq); |
@@ -877,6 +869,14 @@ __cpufreq_cooling_register(struct device_node *np, | |||
877 | pr_debug("%s: freq:%u KHz\n", __func__, freq); | 869 | pr_debug("%s: freq:%u KHz\n", __func__, freq); |
878 | } | 870 | } |
879 | 871 | ||
872 | snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d", | ||
873 | cpufreq_dev->id); | ||
874 | |||
875 | cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev, | ||
876 | &cpufreq_cooling_ops); | ||
877 | if (IS_ERR(cool_dev)) | ||
878 | goto remove_idr; | ||
879 | |||
880 | cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0]; | 880 | cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0]; |
881 | cpufreq_dev->cool_dev = cool_dev; | 881 | cpufreq_dev->cool_dev = cool_dev; |
882 | 882 | ||