lkml.org 
[lkml]   [2005]   [Jan]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[6/8] 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: William Irwin <wli@holomorphy.com>

Index: mm1-2.6.10/net/irda/ircomm/ircomm_event.c
===================================================================
--- mm1-2.6.10.orig/net/irda/ircomm/ircomm_event.c 2005-01-03 06:44:20.000000000 -0800
+++ mm1-2.6.10/net/irda/ircomm/ircomm_event.c 2005-01-03 08:19:38.000000000 -0800
@@ -57,6 +57,7 @@
"IRCOMM_CONN",
};

+#ifdef CONFIG_IRDA_DEBUG
static char *ircomm_event[] = {
"IRCOMM_CONNECT_REQUEST",
"IRCOMM_CONNECT_RESPONSE",
@@ -75,6 +76,7 @@
"IRCOMM_CONTROL_REQUEST",
"IRCOMM_CONTROL_INDICATION",
};
+#endif /* CONFIG_IRDA_DEBUG */

static int (*state[])(struct ircomm_cb *self, IRCOMM_EVENT event,
struct sk_buff *skb, struct ircomm_info *info) =
Index: mm1-2.6.10/net/irda/ircomm/ircomm_tty_attach.c
===================================================================
--- mm1-2.6.10.orig/net/irda/ircomm/ircomm_tty_attach.c 2005-01-03 06:44:20.000000000 -0800
+++ mm1-2.6.10/net/irda/ircomm/ircomm_tty_attach.c 2005-01-03 08:18:48.000000000 -0800
@@ -91,6 +91,7 @@
"*** ERROR *** ",
};

+#ifdef CONFIG_IRDA_DEBUG
static char *ircomm_tty_event[] = {
"IRCOMM_TTY_ATTACH_CABLE",
"IRCOMM_TTY_DETACH_CABLE",
@@ -107,6 +108,7 @@
"IRCOMM_TTY_GOT_LSAPSEL",
"*** ERROR ****",
};
+#endif /* CONFIG_IRDA_DEBUG */

static int (*state[])(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
struct sk_buff *skb, struct ircomm_tty_info *info) =
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:09    [from the cache]
©2003-2011 Jasper Spaans