From: Nick Child <nnac123@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Nick Child <nick.child@ibm.com>, dja@axtens.net
Subject: [PATCH 18/20] powerpc/85xx: Add __init attribute to eligible functions
Date: Wed, 15 Dec 2021 11:12:41 -0500 [thread overview]
Message-ID: <20211215161243.16396-19-nick.child@ibm.com> (raw)
In-Reply-To: <20211215161243.16396-1-nick.child@ibm.com>
Some functions defined in 'arch/powerpc/platforms/85xx' are deserving of an
`__init` macro attribute. These functions are only called by other
initialization functions and therefore should inherit the attribute.
Also, change function declarations in header files to include `__init`.
Signed-off-by: Nick Child <nick.child@ibm.com>
---
arch/powerpc/platforms/85xx/ge_imp3a.c | 2 +-
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 2 +-
arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +-
arch/powerpc/platforms/85xx/socrates_fpga_pic.h | 2 +-
arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/85xx/ge_imp3a.c b/arch/powerpc/platforms/85xx/ge_imp3a.c
index 83a0f7a1f0de..743c65e4d8e4 100644
--- a/arch/powerpc/platforms/85xx/ge_imp3a.c
+++ b/arch/powerpc/platforms/85xx/ge_imp3a.c
@@ -78,7 +78,7 @@ void __init ge_imp3a_pic_init(void)
of_node_put(cascade_node);
}
-static void ge_imp3a_pci_assign_primary(void)
+static void __init ge_imp3a_pci_assign_primary(void)
{
#ifdef CONFIG_PCI
struct device_node *np;
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 172d2b7cfeb7..5bd487030256 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -282,7 +282,7 @@ machine_device_initcall(mpc85xx_cds, mpc85xx_cds_8259_attach);
#endif /* CONFIG_PPC_I8259 */
-static void mpc85xx_cds_pci_assign_primary(void)
+static void __init mpc85xx_cds_pci_assign_primary(void)
{
#ifdef CONFIG_PCI
struct device_node *np;
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index 199a137c0ddb..3768c86b9629 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -271,7 +271,7 @@ static const struct irq_domain_ops socrates_fpga_pic_host_ops = {
.xlate = socrates_fpga_pic_host_xlate,
};
-void socrates_fpga_pic_init(struct device_node *pic)
+void __init socrates_fpga_pic_init(struct device_node *pic)
{
unsigned long flags;
int i;
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.h b/arch/powerpc/platforms/85xx/socrates_fpga_pic.h
index c592b8bc94dd..1d27169309c4 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.h
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.h
@@ -6,6 +6,6 @@
#ifndef SOCRATES_FPGA_PIC_H
#define SOCRATES_FPGA_PIC_H
-void socrates_fpga_pic_init(struct device_node *pic);
+void socrates_fpga_pic_init(struct device_node *pic) __init;
#endif
diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
index d54e1ae56997..397e158c1edb 100644
--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c
+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
@@ -45,7 +45,7 @@ void __init xes_mpc85xx_pic_init(void)
mpic_init(mpic);
}
-static void xes_mpc85xx_configure_l2(void __iomem *l2_base)
+static void __init xes_mpc85xx_configure_l2(void __iomem *l2_base)
{
volatile uint32_t ctl, tmp;
@@ -72,7 +72,7 @@ static void xes_mpc85xx_configure_l2(void __iomem *l2_base)
asm volatile("msync; isync");
}
-static void xes_mpc85xx_fixups(void)
+static void __init xes_mpc85xx_fixups(void)
{
struct device_node *np;
int err;
--
2.25.1
next prev parent reply other threads:[~2021-12-16 8:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-15 16:12 [PATCH 00/20] powerpc: Define eligible functions as __init Nick Child
2021-12-15 16:12 ` [PATCH 01/20] powerpc/kernel: Add __init attribute to eligible functions Nick Child
2021-12-15 16:12 ` [PATCH 02/20] powerpc/lib: " Nick Child
2021-12-15 16:12 ` [PATCH 03/20] powerpc/mm: " Nick Child
2021-12-15 16:12 ` [PATCH 04/20] powerpc/perf: " Nick Child
2021-12-15 16:12 ` [PATCH 05/20] powerpc/sysdev: " Nick Child
2021-12-15 16:12 ` [PATCH 06/20] powerpc/xmon: " Nick Child
2021-12-15 16:12 ` [PATCH 07/20] powerpc/cell: " Nick Child
2021-12-15 16:12 ` [PATCH 08/20] powerpc/chrp: " Nick Child
2021-12-15 16:12 ` [PATCH 09/20] powerpc/pasemi: " Nick Child
2021-12-15 16:12 ` [PATCH 10/20] powerpc/powermac: " Nick Child
2021-12-15 16:12 ` [PATCH 11/20] powerpc/powernv: " Nick Child
2021-12-15 16:12 ` [PATCH 12/20] powerpc/pseries: " Nick Child
2021-12-15 16:12 ` [PATCH 13/20] powerpc/ps3: " Nick Child
2021-12-15 16:12 ` [PATCH 14/20] powerpc/4xx: " Nick Child
2021-12-15 16:12 ` [PATCH 15/20] powerpc/44x: " Nick Child
2021-12-15 16:12 ` [PATCH 16/20] powerpc/embedded6xx: " Nick Child
2021-12-15 16:12 ` [PATCH 17/20] powerpc/83xx: " Nick Child
2021-12-15 16:12 ` Nick Child [this message]
2021-12-15 16:12 ` [PATCH 19/20] powerpc/512x: " Nick Child
2021-12-15 16:12 ` [PATCH 20/20] cuda/pmu: Make find_via_cuda/pmu init functions Nick Child
2021-12-16 9:44 ` [PATCH 00/20] powerpc: Define eligible functions as __init Christophe Leroy
2021-12-16 9:47 ` Christophe Leroy
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=20211215161243.16396-19-nick.child@ibm.com \
--to=nnac123@gmail.com \
--cc=dja@axtens.net \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=nick.child@ibm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox