thermal: cpu_cooling: Remove pointless dependency on CONFIG_OF
Subsystems (2)
PATCH 1/2 thermal: cpu_cooling: Remove pointless dependency on CONFIG_OF
The option CONFIG_CPU_THERMAL depends on CONFIG_OF in the Kconfig.
It it pointless to check if CONFIG_OF is set in the header file as this is always true if CONFIG_CPU_THERMAL is true. Remove it.
--- include/linux/cpu_cooling.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/cpu_cooling.h +2 -2
@@ -47,7 +47,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) }#endif /* CONFIG_CPU_THERMAL */ -#if defined(CONFIG_THERMAL_OF ) && defined(CONFIG_CPU_THERMAL ) +#ifdef CONFIG_CPU_THERMAL /** * of_cpufreq_cooling_register - create cpufreq cooling device based on DT. * @policy: cpufreq policy.
@@ -60,6 +60,6 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) {return NULL ; } -#endif /* defined(CONFIG_THERMAL_OF) && defined(CONFIG_CPU_THERMAL) */ +#endif /* CONFIG_CPU_THERMAL */ #endif /* __CPU_COOLING_H__ */
Signature · 1 line
2.17.1
PATCH 2/2 thermal: cpu_cooling: Reorder the header file
As the conditions are simplified and unified, it is useless to have different blocks of definitions under the same compiler condition, let's merge the blocks.
There is no functional change.
--- include/linux/cpu_cooling.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
include/linux/cpu_cooling.h +7 -9
@@ -33,6 +33,13 @@ cpufreq_cooling_register(struct cpufreq_policy *policy);*/ void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev); +/** +* of_cpufreq_cooling_register - create cpufreq cooling device based on DT. +* @policy: cpufreq policy. +*/ +struct thermal_cooling_device * +of_cpufreq_cooling_register (struct cpufreq_policy *policy); +#else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *cpufreq_cooling_register (struct cpufreq_policy *policy)
@@ -45,16 +52,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) {return ; } -#endif /* CONFIG_CPU_THERMAL */ -#ifdef CONFIG_CPU_THERMAL -/** -* of_cpufreq_cooling_register - create cpufreq cooling device based on DT. -* @policy: cpufreq policy. -*/ -struct thermal_cooling_device * -of_cpufreq_cooling_register (struct cpufreq_policy *policy); -#else static inline struct thermal_cooling_device *of_cpufreq_cooling_register (struct cpufreq_policy *policy) {
Signature · 1 line
2.17.1
Re: [PATCH 2/2] thermal: cpu_cooling: Reorder the header file
Quoted 11 lines · Daniel Lezcano
As the conditions are simplified and unified, it is useless to have different blocks of definitions under the same compiler condition, let's merge the blocks.
There is no functional change.
Signed-off-by Daniel Lezcano <[email protected]>--- include/linux/cpu_cooling.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
Re: [PATCH 2/2] thermal: cpu_cooling: Reorder the header file
In reply to Daniel LezcanoQuoted 8 lines · Daniel Lezcano
As the conditions are simplified and unified, it is useless to have different blocks of definitions under the same compiler condition, let's merge the blocks.
There is no functional change.
Signed-off-by Daniel Lezcano <[email protected]>
Quoted 42 lines
--- include/linux/cpu_cooling.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)include/linux/cpu_cooling.h +7
-10@@ -33,6 +33,13 @@ cpufreq_cooling_register(struct cpufreq_policy *policy);*/ void cpufreq_cooling_unregister (struct thermal_cooling_device *cdev); +/** +* of_cpufreq_cooling_register - create cpufreq cooling device based on DT. +* @policy: cpufreq policy. +*/ +struct thermal_cooling_device * +of_cpufreq_cooling_register (struct cpufreq_policy *policy); +#else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device *cpufreq_cooling_register (struct cpufreq_policy *policy)@@ -45,16 +52,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) {return ; } -#endif /* CONFIG_CPU_THERMAL */ -#ifdef CONFIG_CPU_THERMAL -/** -* of_cpufreq_cooling_register - create cpufreq cooling device based on DT. -* @policy: cpufreq policy. -*/ -struct thermal_cooling_device * -of_cpufreq_cooling_register (struct cpufreq_policy *policy); -#else static inline struct thermal_cooling_device *of_cpufreq_cooling_register (struct cpufreq_policy *policy) { --2.17.1
Quoted 10 lines · Daniel Lezcano
The option
CONFIG_CPU_THERMALdepends onCONFIG_OFin theKconfig.It it pointless to check if
CONFIG_OFis set in the header file as this is always true ifCONFIG_CPU_THERMALis true. Remove it.Signed-off-by Daniel Lezcano <[email protected]>--- include/linux/cpu_cooling.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 7 lines · Daniel Lezcano
The option
CONFIG_CPU_THERMALdepends onCONFIG_OFin theKconfig.It it pointless to check if
CONFIG_OFis set in the header file as this is always true ifCONFIG_CPU_THERMALis true. Remove it.Signed-off-by Daniel Lezcano <[email protected]>
Quoted 28 lines
--- include/linux/cpu_cooling.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)include/linux/cpu_cooling.h +2
-3@@ -47,7 +47,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) }#endif /* CONFIG_CPU_THERMAL */ -#if defined(CONFIG_THERMAL_OF ) && defined(CONFIG_CPU_THERMAL ) +#ifdef CONFIG_CPU_THERMAL /** * of_cpufreq_cooling_register - create cpufreq cooling device based on DT. * @policy: cpufreq policy. @@ -60,6 +60,6 @@ of_cpufreq_cooling_register(struct cpufreq_policy *policy) {return NULL ; } -#endif /* defined(CONFIG_THERMAL_OF) && defined(CONFIG_CPU_THERMAL) */ +#endif /* CONFIG_CPU_THERMAL */ #endif /* __CPU_COOLING_H__ */ --2.17.1