commit b1b9ceff8e2ad90fa66f77738707c02024adf8d0
author Geert Uytterhoeven <geert@linux-m68k.org> Tue Dec 30 14:35:46 2008 +0100
committer Geert Uytterhoeven <geert@linux-m68k.org> Sun Jan 04 12:51:12 2009 +0100
tree b5221a3730baecbfb65e9f96b6c6b1fc9c0253d2
parent da4ac1224faac15bcb0a8d92992e4f8d3d9adb8d

m68k: atari_scc - kill fake config variables

Rename CONFIG_{TT,FALCON,ST}_SCC to SUPPORT_{TT,FALCON,ST}_SCC and reduce ifdef
clutter

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

drivers/char/atari_scc.c

diff --git a/drivers/char/atari_scc.c b/drivers/char/atari_scc.c
index 5dc59ff..fefff96 100644
--- a/drivers/char/atari_scc.c
+++ b/drivers/char/atari_scc.c
@@ -49,9 +49,9 @@
 
 #include "scc.h"
 
-#define CONFIG_TT_SCC     1
-#define CONFIG_FALCON_SCC 1
-#define CONFIG_ST_SCC     1
+#define SUPPORT_TT_SCC     1
+#define SUPPORT_FALCON_SCC 1
+#define SUPPORT_ST_SCC     1
 
 #define CHANNEL_A	0
 #define CHANNEL_B	1
@@ -364,7 +364,7 @@
 	free_irq(IRQ_SCCB_SPCOND, port);
 }
 
-#ifdef CONFIG_TT_SCC
+#ifdef SUPPORT_TT_SCC
 static int atari_tt_scc_init(void)
 {
 	struct scc_port *port;
@@ -464,10 +464,15 @@
 
 	return 0;
 }
-#endif
+#else /* !SUPPORT_TT_SCC */
+static inline int atari_tt_scc_init(void)
+{
+	return -ENODEV;
+}
+#endif /* !SUPPORT_TT_SCC */
 
 
-#ifdef CONFIG_FALCON_SCC
+#ifdef SUPPORT_FALCON_SCC
 static int atari_falcon_scc_init(void)
 {
 	struct scc_port *port;
@@ -541,10 +546,15 @@
 
 	return 0;
 }
-#endif
+#else /* !SUPPORT_FALCON_SCC */
+static inline int atari_falcon_scc_init(void)
+{
+	return -ENODEV;
+}
+#endif /* !SUPPORT_FALCON_SCC */
 
 
-#ifdef CONFIG_ST_SCC
+#ifdef SUPPORT_ST_SCC
 static int atari_st_scc_init(void)
 {
 	struct scc_port *port;
@@ -618,7 +628,12 @@
 
 	return 0;
 }
-#endif
+#else /* !SUPPORT_ST_SCC */
+static inline int atari_st_scc_init(void)
+{
+	return -ENODEV;
+}
+#endif /* !SUPPORT_ST_SCC */
 
 
 int atari_scc_init(void)
@@ -635,18 +650,12 @@
 
 	scc_del = &mfp.par_dt_reg;
 
-#ifdef CONFIG_TT_SCC
 	if (MACH_IS_TT)
 		res = atari_tt_scc_init();
-#endif
-#ifdef CONFIG_FALCON_SCC
 	if (MACH_IS_FALCON)
 		res = atari_falcon_scc_init();
-#endif
-#ifdef CONFIG_ST_SCC
 	if (MACH_IS_ST)
 		res = atari_st_scc_init();
-#endif
 	return res;
 }