Skip to content

Commit ab85a27

Browse files
committed
powerpc: Mark probe_machine() __init and static
Prior to commit b1923ca ("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 <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent a4ac0d2 commit ab85a27

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

arch/powerpc/include/asm/machdep.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ extern struct machdep_calls *machine_id;
235235
machine_id == &mach_##name; \
236236
})
237237

238-
extern void probe_machine(void);
239-
240238
#ifdef CONFIG_PPC_PMAC
241239
/*
242240
* Power macintoshes have either a CUDA, PMU or SMU controlling

arch/powerpc/kernel/setup-common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ static __init int add_pcspkr(void)
582582
device_initcall(add_pcspkr);
583583
#endif /* CONFIG_PCSPKR_PLATFORM */
584584

585-
void probe_machine(void)
585+
static __init void probe_machine(void)
586586
{
587587
extern struct machdep_calls __machine_desc_start;
588588
extern struct machdep_calls __machine_desc_end;

0 commit comments

Comments
 (0)