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/m5249.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/m5249.c')
| -rw-r--r-- | arch/m68k/platform/coldfire/m5249.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/m68k/platform/coldfire/m5249.c b/arch/m68k/platform/coldfire/m5249.c index 405ff3ca4f4f..f6253a3313b3 100644 --- a/arch/m68k/platform/coldfire/m5249.c +++ b/arch/m68k/platform/coldfire/m5249.c @@ -73,17 +73,15 @@ static struct platform_device *m5249_devices[] __initdata = { /***************************************************************************/ -#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) - static void __init m5249_qspi_init(void) { +#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) /* QSPI irq setup */ writeb(MCFSIM_ICR_AUTOVEC | MCFSIM_ICR_LEVEL4 | MCFSIM_ICR_PRI0, MCFSIM_QSPIICR); mcf_mapirq2imr(MCF_IRQ_QSPI, MCFINTC_QSPI); -} - #endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */ +} /***************************************************************************/ @@ -112,9 +110,7 @@ void __init config_BSP(char *commandp, int size) #ifdef CONFIG_M5249C3 m5249_smc91x_init(); #endif -#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) m5249_qspi_init(); -#endif } /***************************************************************************/ |