From: Michael Ellerman <mpe@ellerman.id.au>
To: <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH 6/6] powerpc: Mark probe_machine() __init and static
Date: Wed, 24 Nov 2021 20:32:54 +1100 [thread overview]
Message-ID: <20211124093254.1054750-6-mpe@ellerman.id.au> (raw)
In-Reply-To: <20211124093254.1054750-1-mpe@ellerman.id.au>
Prior to commit b1923caa6e64 ("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>
---
arch/powerpc/include/asm/machdep.h | 2 --
arch/powerpc/kernel/setup-common.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 9c3c9f04129f..e821037f74f0 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -235,8 +235,6 @@ extern struct machdep_calls *machine_id;
machine_id == &mach_##name; \
})
-extern void probe_machine(void);
-
#ifdef CONFIG_PPC_PMAC
/*
* Power macintoshes have either a CUDA, PMU or SMU controlling
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 4f1322b65760..f8da937df918 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -582,7 +582,7 @@ static __init int add_pcspkr(void)
device_initcall(add_pcspkr);
#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_end;
--
2.31.1
next prev parent reply other threads:[~2021-11-24 9:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 9:32 [PATCH 1/6] powerpc/85xx: Fix no previous prototype warning for mpc85xx_setup_pmc() Michael Ellerman
2021-11-24 9:32 ` [PATCH 2/6] powerpc/85xx: Make mpc85xx_smp_kexec_cpu_down() static Michael Ellerman
2021-11-24 9:32 ` [PATCH 3/6] powerpc/85xx: Make c293_pcie_pic_init() static Michael Ellerman
2021-11-24 9:32 ` [PATCH 4/6] powerpc/mm: Move tlbcam_sz() and make it static Michael Ellerman
2021-11-24 9:32 ` [PATCH 5/6] powerpc/smp: Move setup_profiling_timer() under CONFIG_PROFILING Michael Ellerman
2021-11-24 9:32 ` Michael Ellerman [this message]
2021-12-07 13:26 ` [PATCH 1/6] powerpc/85xx: Fix no previous prototype warning for mpc85xx_setup_pmc() Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211124093254.1054750-6-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=linuxppc-dev@lists.ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.