Commit 135a8811 authored by William Lee Irwin III's avatar William Lee Irwin III Committed by Linus Torvalds

[PATCH] make IRDA string tables conditional on CONFIG_IRDA_DEBUG

There are some string tables only used for debugging printk()'s in IRDA
that trip warnings when CONFIG_IRDA_DEBUG is not set.

This patch makes them conditional on CONFIG_IRDA_DEBUG to silence warnings.
Signed-off-by: default avatarWilliam Irwin <wli@holomorphy.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3f256744
...@@ -57,6 +57,7 @@ char *ircomm_state[] = { ...@@ -57,6 +57,7 @@ char *ircomm_state[] = {
"IRCOMM_CONN", "IRCOMM_CONN",
}; };
#ifdef CONFIG_IRDA_DEBUG
static char *ircomm_event[] = { static char *ircomm_event[] = {
"IRCOMM_CONNECT_REQUEST", "IRCOMM_CONNECT_REQUEST",
"IRCOMM_CONNECT_RESPONSE", "IRCOMM_CONNECT_RESPONSE",
...@@ -75,6 +76,7 @@ static char *ircomm_event[] = { ...@@ -75,6 +76,7 @@ static char *ircomm_event[] = {
"IRCOMM_CONTROL_REQUEST", "IRCOMM_CONTROL_REQUEST",
"IRCOMM_CONTROL_INDICATION", "IRCOMM_CONTROL_INDICATION",
}; };
#endif /* CONFIG_IRDA_DEBUG */
static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event, static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event,
struct sk_buff *skb, struct ircomm_info *info) = struct sk_buff *skb, struct ircomm_info *info) =
......
...@@ -91,6 +91,7 @@ char *ircomm_tty_state[] = { ...@@ -91,6 +91,7 @@ char *ircomm_tty_state[] = {
"*** ERROR *** ", "*** ERROR *** ",
}; };
#ifdef CONFIG_IRDA_DEBUG
static char *ircomm_tty_event[] = { static char *ircomm_tty_event[] = {
"IRCOMM_TTY_ATTACH_CABLE", "IRCOMM_TTY_ATTACH_CABLE",
"IRCOMM_TTY_DETACH_CABLE", "IRCOMM_TTY_DETACH_CABLE",
...@@ -107,6 +108,7 @@ static char *ircomm_tty_event[] = { ...@@ -107,6 +108,7 @@ static char *ircomm_tty_event[] = {
"IRCOMM_TTY_GOT_LSAPSEL", "IRCOMM_TTY_GOT_LSAPSEL",
"*** ERROR ****", "*** ERROR ****",
}; };
#endif /* CONFIG_IRDA_DEBUG */
static int (*state[])(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event, static int (*state[])(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
struct sk_buff *skb, struct ircomm_tty_info *info) = struct sk_buff *skb, struct ircomm_tty_info *info) =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment