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

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
...@@ -60,10 +60,6 @@ static void __init twr_p1025_pic_init(void) ...@@ -60,10 +60,6 @@ static void __init twr_p1025_pic_init(void)
*/ */
static void __init twr_p1025_setup_arch(void) static void __init twr_p1025_setup_arch(void)
{ {
#ifdef CONFIG_QUICC_ENGINE
struct device_node *np;
#endif
if (ppc_md.progress) if (ppc_md.progress)
ppc_md.progress("twr_p1025_setup_arch()", 0); ppc_md.progress("twr_p1025_setup_arch()", 0);
...@@ -77,6 +73,7 @@ static void __init twr_p1025_setup_arch(void) ...@@ -77,6 +73,7 @@ static void __init twr_p1025_setup_arch(void)
#if IS_ENABLED(CONFIG_UCC_GETH) || IS_ENABLED(CONFIG_SERIAL_QE) #if IS_ENABLED(CONFIG_UCC_GETH) || IS_ENABLED(CONFIG_SERIAL_QE)
if (machine_is(twr_p1025)) { if (machine_is(twr_p1025)) {
struct ccsr_guts __iomem *guts; struct ccsr_guts __iomem *guts;
struct device_node *np;
np = of_find_compatible_node(NULL, NULL, "fsl,p1021-guts"); np = of_find_compatible_node(NULL, NULL, "fsl,p1021-guts");
if (np) { if (np) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment