2021-02-23 13:58:34

by Geert Uytterhoeven

Subject: [PATCH] powerpc/chrp: Make hydra_init() static

Commit 407d418f2fd4c20a ("powerpc/chrp: Move PHB discovery") moved the
sole call to hydra_init() to the source file where it is defined, so it
can be made static.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Compile-tested only. My LongTrail died in 2004.
---
arch/powerpc/include/asm/hydra.h | 2 --
arch/powerpc/platforms/chrp/pci.c | 3 +--
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/powerpc/include/asm/hydra.h b/arch/powerpc/include/asm/hydra.h
index ae02eb53d6ef8221..d024447283a0cf3c 100644
--- a/arch/powerpc/include/asm/hydra.h
+++ b/arch/powerpc/include/asm/hydra.h
@@ -94,8 +94,6 @@ extern volatile struct Hydra __iomem *Hydra;
#define HYDRA_INT_EXT7 18 /* Power Off Request */
#define HYDRA_INT_SPARE 19

-extern int hydra_init(void);
-
#endif /* __KERNEL__ */

#endif /* _ASMPPC_HYDRA_H */
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 8c421dc78b28334b..76e6256cb0a788f4 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -131,8 +131,7 @@ static struct pci_ops rtas_pci_ops =

volatile struct Hydra __iomem *Hydra = NULL;

-int __init
-hydra_init(void)
+static int __init hydra_init(void)
{
struct device_node *np;
struct resource r;
--
2.25.1

2021-03-31 01:14:53

by Michael Ellerman

Subject: Re: [PATCH] powerpc/chrp: Make hydra_init() static

On Tue, 23 Feb 2021 10:53:45 +0100, Geert Uytterhoeven wrote:
> Commit 407d418f2fd4c20a ("powerpc/chrp: Move PHB discovery") moved the
> sole call to hydra_init() to the source file where it is defined, so it
> can be made static.

Applied to powerpc/next.

[1/1] powerpc/chrp: Make hydra_init() static
https://git.kernel.org/powerpc/c/9634afa67bfd933b231405d05dda37ffa169f32c

cheers