| Message ID | 20191030091038.678-1-daniel.lezcano@linaro.org |
|---|---|
| State | Accepted |
| Commit | f5bf3c06730c1bd85a3c064357de433736facc5a |
| Headers | show |
| Series | [1/2] thermal: cpu_cooling: Remove pointless dependency on CONFIG_OF | expand |
On Wed, 30 Oct 2019 at 14:41, Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > 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. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > include/linux/cpu_cooling.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On Wed, Oct 30, 2019 at 2:41 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > 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. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > --- > include/linux/cpu_cooling.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h > index bae54bb7c048..72d1c9c5e538 100644 > --- a/include/linux/cpu_cooling.h > +++ b/include/linux/cpu_cooling.h > @@ -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 >
On Wed, Oct 30, 2019 at 2:41 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > 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 <daniel.lezcano@linaro.org> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> > --- > include/linux/cpu_cooling.h | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h > index 72d1c9c5e538..b74732535e4b 100644 > --- a/include/linux/cpu_cooling.h > +++ b/include/linux/cpu_cooling.h > @@ -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 >
diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index bae54bb7c048..72d1c9c5e538 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -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__ */
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. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- include/linux/cpu_cooling.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1