summaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/coldfire/m528x.c
diff options
context:
space:
mode:
authorSteven King <sfking@fdwdc.com>2014-05-14 10:07:55 -0700
committerGreg Ungerer <gerg@uclinux.org>2014-05-26 13:28:37 +1000
commit151d14f4ac5a02cc059cb05b2a2f27ec5b9d6831 (patch)
tree07b6a7e045ccef506f6034677aeecb23eb28a88f /arch/m68k/platform/coldfire/m528x.c
parente93e91f2255fce33727d5f618cb16885fd157291 (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/m528x.c')
-rw-r--r--arch/m68k/platform/coldfire/m528x.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/m68k/platform/coldfire/m528x.c b/arch/m68k/platform/coldfire/m528x.c
index d8348c9a42fa..21cd161d36f1 100644
--- a/arch/m68k/platform/coldfire/m528x.c
+++ b/arch/m68k/platform/coldfire/m528x.c
@@ -54,15 +54,13 @@ struct clk *mcf_clks[] = {
/***************************************************************************/
-#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
-
static void __init m528x_qspi_init(void)
{
+#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
/* setup Port QS for QSPI with gpio CS control */
__raw_writeb(0x07, MCFGPIO_PQSPAR);
-}
-
#endif /* IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) */
+}
/***************************************************************************/
@@ -128,9 +126,7 @@ void __init config_BSP(char *commandp, int size)
mach_sched_init = hw_timer_init;
m528x_uarts_init();
m528x_fec_init();
-#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
m528x_qspi_init();
-#endif
}
/***************************************************************************/