diff options
| author |   Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2019-12-19 16:16:02 +0100 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2020-01-06 16:25:31 +1100 |
| commit | 3a9d970f17e05a7b26f782beb8f7f2118d1741ea (patch) | |
| tree | dc5b348452d192a92c37fc8696febe8a2af936b8 /arch/powerpc/platforms/85xx/twr_p102x.c | |
| parent | powerpc/pseries/svm: Allow IOMMU to work in SVM (diff) | |
| download | linux-dev-3a9d970f17e05a7b26f782beb8f7f2118d1741ea.tar.xz linux-dev-3a9d970f17e05a7b26f782beb8f7f2118d1741ea.zip | |
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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Scott Wood <oss@buserror.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20191219151602.1908411-1-bigeasy@linutronix.de
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/85xx/twr_p102x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 6c3c0cdaee9a..b301ef9d6ce7 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -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) { |