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

powerpc: Mark probe_machine() __init and static

Browse Source 
Prior to commit b1923caa6e ("powerpc: Merge 32-bit and 64-bit
setup_arch()") probe_machine() was called from setup_32/64.c and lived
in setup-common.c. But now it's only called from setup-common.c so it
can be static and __init, and we don't need the declaration in
machdep.h either.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211124093254.1054750-6-mpe@ellerman.id.au
This commit is contained in:
Michael Ellerman 2021-11-24 20:32:54 +11:00
parent a4ac0d249a
commit ab85a27395
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/machdep.h
View File

@ -235,8 +235,6 @@ extern struct machdep_calls *machine_id;
machine_id == &mach_##name; \ machine_id == &mach_##name; \
}) })
extern void probe_machine(void);
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
/* /*
* Power macintoshes have either a CUDA, PMU or SMU controlling * Power macintoshes have either a CUDA, PMU or SMU controlling

2
arch/powerpc/kernel/setup-common.c
View File

@ -582,7 +582,7 @@ static __init int add_pcspkr(void)
device_initcall(add_pcspkr); device_initcall(add_pcspkr);
#endif /* CONFIG_PCSPKR_PLATFORM */ #endif /* CONFIG_PCSPKR_PLATFORM */
void probe_machine(void) static __init void probe_machine(void)
{ {
extern struct machdep_calls __machine_desc_start; extern struct machdep_calls __machine_desc_start;
extern struct machdep_calls __machine_desc_end; extern struct machdep_calls __machine_desc_end;