leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: Rename cpu_read_ops() to init_cpu_ops()

Browse Source 
This renames cpu_read_ops() to init_cpu_ops() as the function is only
called in initialization phase. Also, we will introduce get_cpu_ops() in
the subsequent patches, to retireve the CPU operation by the given CPU
index. The usage of cpu_read_ops() and get_cpu_ops() are difficult to be
distinguished from their names.

Signed-off-by: Gavin Shan <gshan@redhat.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Gavin Shan 2020-03-19 10:01:43 +11:00 committed by Catalin Marinas
parent 7fec52bf80
commit 6885fb129b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/include/asm/cpu_ops.h
View File

@ -56,11 +56,11 @@ struct cpu_operations {
}; };
extern const struct cpu_operations *cpu_ops[NR_CPUS]; extern const struct cpu_operations *cpu_ops[NR_CPUS];
int __init cpu_read_ops(int cpu); int __init init_cpu_ops(int cpu);
static inline void __init cpu_read_bootcpu_ops(void) static inline void __init init_bootcpu_ops(void)
{ {
cpu_read_ops(0); init_cpu_ops(0);
} }
#endif /* ifndef __ASM_CPU_OPS_H */ #endif /* ifndef __ASM_CPU_OPS_H */

2
arch/arm64/kernel/cpu_ops.c
View File

@ -96,7 +96,7 @@ static const char *__init cpu_read_enable_method(int cpu)
/* /*
* Read a cpu's enable method and record it in cpu_ops. * Read a cpu's enable method and record it in cpu_ops.
*/ */
int __init cpu_read_ops(int cpu) int __init init_cpu_ops(int cpu)
{ {
const char *enable_method = cpu_read_enable_method(cpu); const char *enable_method = cpu_read_enable_method(cpu);

2
arch/arm64/kernel/setup.c
View File

@ -344,7 +344,7 @@ void __init setup_arch(char **cmdline_p)
else else
psci_acpi_init(); psci_acpi_init();
cpu_read_bootcpu_ops(); init_bootcpu_ops();
smp_init_cpus(); smp_init_cpus();
smp_build_mpidr_hash(); smp_build_mpidr_hash();

2
arch/arm64/kernel/smp.c
View File

@ -488,7 +488,7 @@ static bool __init is_mpidr_duplicate(unsigned int cpu, u64 hwid)
*/ */
static int __init smp_cpu_setup(int cpu) static int __init smp_cpu_setup(int cpu)
{ {
if (cpu_read_ops(cpu)) if (init_cpu_ops(cpu))
return -ENODEV; return -ENODEV;
if (cpu_ops[cpu]->cpu_init(cpu)) if (cpu_ops[cpu]->cpu_init(cpu))