Commit 3a9d970f authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Michael Ellerman
Browse files

powerpc/85xx: Get twr_p102x to compile again 



With CONFIG_QUICC_ENGINE enabled and CONFIG_UCC_GETH + CONFIG_SERIAL_QE
disabled we have an unused variable (np). The code won't compile with
-Werror.

Move the np variable to the block where it is actually used.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: default avatarScott Wood <oss@buserror.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191219151602.1908411-1-bigeasy@linutronix.de
parent 978bff4e

arch/powerpc/platforms/85xx/twr_p102x.c

+1 −4
Original line number Diff line number Diff line
@@ -60,10 +60,6 @@ static void __init twr_p1025_pic_init(void) 
 */

static void __init twr_p1025_setup_arch(void)

{

#ifdef CONFIG_QUICC_ENGINE

	struct device_node *np;

#endif



	if (ppc_md.progress)

		ppc_md.progress("twr_p1025_setup_arch()", 0);
@@ -77,6 +73,7 @@ static void __init twr_p1025_setup_arch(void) 
#if IS_ENABLED(CONFIG_UCC_GETH) || IS_ENABLED(CONFIG_SERIAL_QE)

	if (machine_is(twr_p1025)) {

		struct ccsr_guts __iomem *guts;

		struct device_node *np;



		np = of_find_compatible_node(NULL, NULL, "fsl,p1021-guts");

		if (np) {