History

thermal/drivers/cpu_cooling: Rename to cpufreq_cooling

As we introduced the idle injection cooling device called cpuidle_cooling, let's be consistent and rename the cpu_cooling to cpufreq_cooling as this one mitigates with OPPs changes.

Daniel Lezcano committed 6 years ago

Commit 23affa21 parent a4c428e6 files · +8 −8Browse files

Unified · Split

6 files
  1. Documentation/driver-api/thermal/exynos_thermal.rst +1 −1
  2. MAINTAINERS +1 −1
  3. drivers/thermal/Makefile +1 −1
  4. drivers/thermal/clock_cooling.c +1 −1
  5. drivers/thermal/cpufreq_cooling.c +3 −3
  6. include/linux/clock_cooling.h +1 −1
Documentation/driver-api/thermal/exynos_thermal.rst+1−1
@@ -67,7 +67,7 @@ TMU driver description: · 66 unmodified lines
67The exynos thermal driver is structured as::67The exynos thermal driver is structured as::
68 68
69 Kernel Core thermal framework69 Kernel Core thermal framework
70 (thermal_core.c, step_wise.c, cpu_cooling.c)70 (thermal_core.c, step_wise.c, cpufreq_cooling.c)
71 ^71 ^
72 |72 |
73 |73 |
MAINTAINERS+1−1
@@ -16349,7 +16349,7 @@ L: linux-pm@vger.kernel.org · 16348 unmodified lines
16349S: Supported16349S: Supported
16350F: Documentation/driver-api/thermal/cpu-cooling-api.rst16350F: Documentation/driver-api/thermal/cpu-cooling-api.rst
16351F: Documentation/driver-api/thermal/cpu-idle-cooling.rst16351F: Documentation/driver-api/thermal/cpu-idle-cooling.rst
16352F: drivers/thermal/cpu_cooling.c16352F: drivers/thermal/cpufreq_cooling.c
16353F: drivers/thermal/cpuidle_cooling.c16353F: drivers/thermal/cpuidle_cooling.c
16354F: include/linux/cpu_cooling.h16354F: include/linux/cpu_cooling.h
16355 16355
drivers/thermal/Makefile+1−1
@@ -19,7 +19,7 @@ thermal_sys-$(CONFIG_THERMAL_GOV_USER_SPACE) += user_space.o · 18 unmodified lines
19thermal_sys-$(CONFIG_THERMAL_GOV_POWER_ALLOCATOR) += power_allocator.o19thermal_sys-$(CONFIG_THERMAL_GOV_POWER_ALLOCATOR) += power_allocator.o
20 20
21# cpufreq cooling21# cpufreq cooling
22thermal_sys-$(CONFIG_CPU_FREQ_THERMAL) += cpu_cooling.o22thermal_sys-$(CONFIG_CPU_FREQ_THERMAL) += cpufreq_cooling.o
23thermal_sys-$(CONFIG_CPU_IDLE_THERMAL) += cpuidle_cooling.o23thermal_sys-$(CONFIG_CPU_IDLE_THERMAL) += cpuidle_cooling.o
24 24
25# clock cooling25# clock cooling
drivers/thermal/clock_cooling.c+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
7 * Copyright (C) 2013 Texas Instruments Inc.7 * Copyright (C) 2013 Texas Instruments Inc.
8 * Contact: Eduardo Valentin <eduardo.valentin@ti.com>8 * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
9 *9 *
10 * Highly based on cpu_cooling.c.10 * Highly based on cpufreq_cooling.c.
11 * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)11 * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)
12 * Copyright (C) 2012 Amit Daniel <amit.kachhap@linaro.org>12 * Copyright (C) 2012 Amit Daniel <amit.kachhap@linaro.org>
13 */13 */
drivers/thermal/cpufreq_cooling.crenamed from drivers/thermal/cpu_cooling.c+3−3
@@ -1,6 +1,6 @@
1// SPDX-License-Identifier: GPL-2.01// SPDX-License-Identifier: GPL-2.0
2/*2/*
3 * linux/drivers/thermal/cpu_cooling.c3 * linux/drivers/thermal/cpufreq_cooling.c
4 *4 *
5 * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)5 * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)
6 *6 *
@@ -621,7 +621,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) · 614 unmodified lines
621 struct thermal_cooling_device *cdev = NULL;621 struct thermal_cooling_device *cdev = NULL;
622 622
623 if (!np) {623 if (!np) {
624 pr_err("cpu_cooling: OF node not available for cpu%d\n",624 pr_err("cpufreq_cooling: OF node not available for cpu%d\n",
625 policy->cpu);625 policy->cpu);
626 return NULL;626 return NULL;
627 }627 }
@@ -631,7 +631,7 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) · 3 unmodified lines
631 631
632 cdev = __cpufreq_cooling_register(np, policy, em);632 cdev = __cpufreq_cooling_register(np, policy, em);
633 if (IS_ERR(cdev)) {633 if (IS_ERR(cdev)) {
634 pr_err("cpu_cooling: cpu%d failed to register as cooling device: %ld\n",634 pr_err("cpufreq_cooling: cpu%d failed to register as cooling device: %ld\n",
635 policy->cpu, PTR_ERR(cdev));635 policy->cpu, PTR_ERR(cdev));
636 cdev = NULL;636 cdev = NULL;
637 }637 }
include/linux/clock_cooling.h+1−1
@@ -7,7 +7,7 @@ · 6 unmodified lines
7 * Copyright (C) 2013 Texas Instruments Inc.7 * Copyright (C) 2013 Texas Instruments Inc.
8 * Contact: Eduardo Valentin <eduardo.valentin@ti.com>8 * Contact: Eduardo Valentin <eduardo.valentin@ti.com>
9 *9 *
10 * Highly based on cpu_cooling.c.10 * Highly based on cpufreq_cooling.c.
11 * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)11 * Copyright (C) 2012 Samsung Electronics Co., Ltd(http://www.samsung.com)
12 * Copyright (C) 2012 Amit Daniel <amit.kachhap@linaro.org>12 * Copyright (C) 2012 Amit Daniel <amit.kachhap@linaro.org>
13 */13 */