summaryrefslogtreecommitdiffstats
path: root/include/linux/console.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-09-28 23:36:14 +0200
committerJason Wessel <jason.wessel@windriver.com>2012-10-12 06:37:36 -0500
commitf2f0945e356daef87cdb01c0302801fb11cf382a (patch)
tree458c92d6a4a70f03ada073376bd16fdcf843e177 /include/linux/console.h
parent17b572e82032bc246324ce136696656b66d4e3f1 (diff)
downloadlinux-f2f0945e356daef87cdb01c0302801fb11cf382a.tar.gz
linux-f2f0945e356daef87cdb01c0302801fb11cf382a.tar.bz2
linux-f2f0945e356daef87cdb01c0302801fb11cf382a.zip
tty/console: fix warnings in drivers/tty/serial/kgdboc.c
The con_debug_leave/con_debug_enter functions are stubbed out by defining them to (0), which causes harmless build warnings. Using proper inline functions is the normal way to deal with this. Without this patch, building the ARM bcm2835_defconfig results in: drivers/tty/serial/kgdboc.c: In function 'kgdboc_pre_exp_handler': drivers/tty/serial/kgdboc.c:279:3: warning: statement with no effect [-Wunused-value] drivers/tty/serial/kgdboc.c: In function 'kgdboc_post_exp_handler': drivers/tty/serial/kgdboc.c:293:3: warning: statement with no effect [-Wunused-value] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Anton Vorontsov <anton.vorontsov@linaro.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Diffstat (limited to 'include/linux/console.h')
-rw-r--r--include/linux/console.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h
index 7201ce4280ca..dedb082fe50f 100644
--- a/include/linux/console.h
+++ b/include/linux/console.h
@@ -83,8 +83,14 @@ void give_up_console(const struct consw *sw);
int con_debug_enter(struct vc_data *vc);
int con_debug_leave(void);
#else
-#define con_debug_enter(vc) (0)
-#define con_debug_leave() (0)
+static inline int con_debug_enter(struct vc_data *vc)
+{
+ return 0;
+}
+static inline int con_debug_leave(void)
+{
+ return 0;
+}
#endif
/* scroll */