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

powerpc/512x: Make mpc512x_select_reset_compat() static

Browse Source 
mpc512x_select_reset_compat() is only used in the file it
is defined.

Make it static.

Move mpc512x_restart_init() after mpc512x_select_reset_compat().

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/36a19e13025dbf17e92e832dd24150642b0e9bad.1692341499.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2023-08-18 08:51:48 +02:00 committed by Michael Ellerman
parent f94a84a091
commit be922070d0
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/platforms/512x/mpc512x.h
View File

@ -13,7 +13,6 @@ extern void __init mpc512x_init(void);
extern void __init mpc512x_setup_arch(void); extern void __init mpc512x_setup_arch(void);
extern int __init mpc5121_clk_init(void); extern int __init mpc5121_clk_init(void);
const char *__init mpc512x_select_psc_compat(void); const char *__init mpc512x_select_psc_compat(void);
const char *__init mpc512x_select_reset_compat(void);
extern void __noreturn mpc512x_restart(char *cmd); extern void __noreturn mpc512x_restart(char *cmd);
#endif /* __MPC512X_H__ */ #endif /* __MPC512X_H__ */

30
arch/powerpc/platforms/512x/mpc512x_shared.c
View File

@ -29,20 +29,6 @@
static struct mpc512x_reset_module __iomem *reset_module_base; static struct mpc512x_reset_module __iomem *reset_module_base;
static void __init mpc512x_restart_init(void)
{
struct device_node *np;
const char *reset_compat;
reset_compat = mpc512x_select_reset_compat();
np = of_find_compatible_node(NULL, NULL, reset_compat);
if (!np)
return;
reset_module_base = of_iomap(np, 0);
of_node_put(np);
}
void __noreturn mpc512x_restart(char *cmd) void __noreturn mpc512x_restart(char *cmd)
{ {
if (reset_module_base) { if (reset_module_base) {
@ -363,7 +349,7 @@ const char *__init mpc512x_select_psc_compat(void)
return NULL; return NULL;
} }
const char *__init mpc512x_select_reset_compat(void) static const char *__init mpc512x_select_reset_compat(void)
{ {
if (of_machine_is_compatible("fsl,mpc5121")) if (of_machine_is_compatible("fsl,mpc5121"))
return "fsl,mpc5121-reset"; return "fsl,mpc5121-reset";
@ -455,6 +441,20 @@ static void __init mpc512x_psc_fifo_init(void)
} }
} }
static void __init mpc512x_restart_init(void)
{
struct device_node *np;
const char *reset_compat;
reset_compat = mpc512x_select_reset_compat();
np = of_find_compatible_node(NULL, NULL, reset_compat);
if (!np)
return;
reset_module_base = of_iomap(np, 0);
of_node_put(np);
}
void __init mpc512x_init_early(void) void __init mpc512x_init_early(void)
{ {
mpc512x_restart_init(); mpc512x_restart_init();