diff options
author | Steven King <sfking@fdwdc.com> | 2014-05-14 10:07:55 -0700 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2014-05-26 13:28:37 +1000 |
commit | 151d14f4ac5a02cc059cb05b2a2f27ec5b9d6831 (patch) | |
tree | 07b6a7e045ccef506f6034677aeecb23eb28a88f /arch/m68k/platform/coldfire/m53xx.c | |
parent | e93e91f2255fce33727d5f618cb16885fd157291 (diff) |
m68knommu: qspi declutter.
Move the check for the QSPI config option inside the function body. If the
option is not enabled, the compiler will optimize away the empty function
body so we can remove the other check for the config option.
Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/platform/coldfire/m53xx.c')
-rw-r--r-- | arch/m68k/platform/coldfire/m53xx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/m68k/platform/coldfire/m53xx.c b/arch/m68k/platform/coldfire/m53xx.c index 5286f98fbed0..80879a7fe3d5 100644 --- a/arch/m68k/platform/coldfire/m53xx.c +++ b/arch/m68k/platform/coldfire/m53xx.c @@ -166,15 +166,13 @@ static void __init m53xx_clk_init(void) /***************************************************************************/ -#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) - static void __init m53xx_qspi_init(void) { +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) /* setup QSPS pins for QSPI with gpio CS control */ writew(0x01f0, MCFGPIO_PAR_QSPI); -} - #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ +} /***************************************************************************/ @@ -219,9 +217,7 @@ void __init config_BSP(char *commandp, int size) m53xx_clk_init(); m53xx_uarts_init(); m53xx_fec_init(); -#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) m53xx_qspi_init(); -#endif #ifdef CONFIG_BDM_DISABLE /* |