The sched domain pointer argument from topology_get_freq_scale() and
topology_get_cpu_scale() got removed by commit 7673c8a4c75d
("sched/cpufreq: Remove arch_scale_freq_capacity()'s 'sd' parameter")
and commit 8ec59c0f5f49 ("sched/topology: Remove unused 'sd' parameter
from arch_scale_cpu_capacity()").
So the 'struct sched_domain' forward declaration is no longer needed.
Remove it.
W/o the sched domain pointer argument the storage class and inline
definition as well as the return type, function name and parameter list
fit all into one line.
Signed-off-by: Dietmar Eggemann <[email protected]>
Reviewed-by: Sudeep Holla <[email protected]>
---
include/linux/arch_topology.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h
index 3015ecbb90b1..c507e9ddd909 100644
--- a/include/linux/arch_topology.h
+++ b/include/linux/arch_topology.h
@@ -16,9 +16,7 @@ bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu);
DECLARE_PER_CPU(unsigned long, cpu_scale);
-struct sched_domain;
-static inline
-unsigned long topology_get_cpu_scale(int cpu)
+static inline unsigned long topology_get_cpu_scale(int cpu)
{
return per_cpu(cpu_scale, cpu);
}
@@ -27,8 +25,7 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity);
DECLARE_PER_CPU(unsigned long, freq_scale);
-static inline
-unsigned long topology_get_freq_scale(int cpu)
+static inline unsigned long topology_get_freq_scale(int cpu)
{
return per_cpu(freq_scale, cpu);
}
--
2.17.1
On Mon, Feb 10, 2020 at 04:24:20PM +0100, Dietmar Eggemann wrote:
> The sched domain pointer argument from topology_get_freq_scale() and
> topology_get_cpu_scale() got removed by commit 7673c8a4c75d
> ("sched/cpufreq: Remove arch_scale_freq_capacity()'s 'sd' parameter")
> and commit 8ec59c0f5f49 ("sched/topology: Remove unused 'sd' parameter
> from arch_scale_cpu_capacity()").
>
> So the 'struct sched_domain' forward declaration is no longer needed.
> Remove it.
>
> W/o the sched domain pointer argument the storage class and inline
> definition as well as the return type, function name and parameter list
> fit all into one line.
>
> Signed-off-by: Dietmar Eggemann <[email protected]>
> Reviewed-by: Sudeep Holla <[email protected]>
> ---
> include/linux/arch_topology.h | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h
> index 3015ecbb90b1..c507e9ddd909 100644
> --- a/include/linux/arch_topology.h
> +++ b/include/linux/arch_topology.h
> @@ -16,9 +16,7 @@ bool topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu);
>
> DECLARE_PER_CPU(unsigned long, cpu_scale);
>
> -struct sched_domain;
> -static inline
> -unsigned long topology_get_cpu_scale(int cpu)
> +static inline unsigned long topology_get_cpu_scale(int cpu)
> {
> return per_cpu(cpu_scale, cpu);
> }
> @@ -27,8 +25,7 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity);
>
> DECLARE_PER_CPU(unsigned long, freq_scale);
>
> -static inline
> -unsigned long topology_get_freq_scale(int cpu)
> +static inline unsigned long topology_get_freq_scale(int cpu)
You are doing two different things in this patch :(
Reformatting the function names are fine, but that has nothing to do
with dropping the "struct sched_domain;" line. Please split into 2
different patches.
thanks,
greg k-h