Commit be922070 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/512x: Make mpc512x_select_reset_compat() static 



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: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/36a19e13025dbf17e92e832dd24150642b0e9bad.1692341499.git.christophe.leroy@csgroup.eu
parent f94a84a0

arch/powerpc/platforms/512x/mpc512x.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ extern void __init mpc512x_init(void); 
extern void __init mpc512x_setup_arch(void);

extern int __init mpc5121_clk_init(void);

const char *__init mpc512x_select_psc_compat(void);

const char *__init mpc512x_select_reset_compat(void);

extern void __noreturn mpc512x_restart(char *cmd);



#endif				/* __MPC512X_H__ */

arch/powerpc/platforms/512x/mpc512x_shared.c

+15 −15
Original line number Diff line number Diff line
@@ -29,20 +29,6 @@ 


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)

{

	if (reset_module_base) {
@@ -363,7 +349,7 @@ const char *__init mpc512x_select_psc_compat(void) 
	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"))

		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)

{

	mpc512x_restart_init();