]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tty/console: fix warnings in drivers/tty/serial/kgdboc.c
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 21:36:14 +0000 (23:36 +0200)
committerJason Wessel <jason.wessel@windriver.com>
Fri, 12 Oct 2012 11:37:36 +0000 (06:37 -0500)
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>
include/linux/console.h

index 7201ce4280caceb594e4cd11cf6ca4e7a072efee..dedb082fe50fde9e62190569b0c362238a46f1b0 100644 (file)
@@ -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 */