Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

irda: Fix build failures after IRDA_DEBUG->pr_debug

Browse Source 
Fix the build failures that result from the use of pr_debug
without the referenced char * arrays being defined.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2014-11-12 18:15:47 -08:00 committed by David S. Miller
parent 4d3c9d37f7
commit a768851f94
6 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/irda/ircomm/ircomm_event.c
View File

@ -54,8 +54,7 @@ const char *const ircomm_state[] = {
"IRCOMM_CONN", "IRCOMM_CONN",
}; };
#ifdef CONFIG_IRDA_DEBUG static const char *const ircomm_event[] __maybe_unused = {
static const char *const ircomm_event[] = {
"IRCOMM_CONNECT_REQUEST", "IRCOMM_CONNECT_REQUEST",
"IRCOMM_CONNECT_RESPONSE", "IRCOMM_CONNECT_RESPONSE",
"IRCOMM_TTP_CONNECT_INDICATION", "IRCOMM_TTP_CONNECT_INDICATION",
@ -73,7 +72,6 @@ static const char *const 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) =

4
net/irda/ircomm/ircomm_tty_attach.c
View File

@ -89,8 +89,7 @@ const char *const ircomm_tty_state[] = {
"*** ERROR *** ", "*** ERROR *** ",
}; };
#ifdef CONFIG_IRDA_DEBUG static const char *const ircomm_tty_event[] __maybe_unused = {
static const char *const ircomm_tty_event[] = {
"IRCOMM_TTY_ATTACH_CABLE", "IRCOMM_TTY_ATTACH_CABLE",
"IRCOMM_TTY_DETACH_CABLE", "IRCOMM_TTY_DETACH_CABLE",
"IRCOMM_TTY_DATA_REQUEST", "IRCOMM_TTY_DATA_REQUEST",
@ -106,7 +105,6 @@ static const char *const 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) =

4
net/irda/iriap.c
View File

@ -43,9 +43,8 @@
#include <net/irda/iriap_event.h> #include <net/irda/iriap_event.h>
#include <net/irda/iriap.h> #include <net/irda/iriap.h>
#ifdef CONFIG_IRDA_DEBUG
/* FIXME: This one should go in irlmp.c */ /* FIXME: This one should go in irlmp.c */
static const char *const ias_charset_types[] = { static const char *const ias_charset_types[] __maybe_unused = {
"CS_ASCII", "CS_ASCII",
"CS_ISO_8859_1", "CS_ISO_8859_1",
"CS_ISO_8859_2", "CS_ISO_8859_2",
@ -58,7 +57,6 @@ static const char *const ias_charset_types[] = {
"CS_ISO_8859_9", "CS_ISO_8859_9",
"CS_UNICODE" "CS_UNICODE"
}; };
#endif /* CONFIG_IRDA_DEBUG */
static hashbin_t *iriap = NULL; static hashbin_t *iriap = NULL;
static void *service_handle; static void *service_handle;

4
net/irda/irlap.c
View File

@ -60,8 +60,7 @@ static void __irlap_close(struct irlap_cb *self);
static void irlap_init_qos_capabilities(struct irlap_cb *self, static void irlap_init_qos_capabilities(struct irlap_cb *self,
struct qos_info *qos_user); struct qos_info *qos_user);
#ifdef CONFIG_IRDA_DEBUG static const char *const lap_reasons[] __maybe_unused = {
static const char *const lap_reasons[] = {
"ERROR, NOT USED", "ERROR, NOT USED",
"LAP_DISC_INDICATION", "LAP_DISC_INDICATION",
"LAP_NO_RESPONSE", "LAP_NO_RESPONSE",
@ -71,7 +70,6 @@ static const char *const lap_reasons[] = {
"LAP_PRIMARY_CONFLICT", "LAP_PRIMARY_CONFLICT",
"ERROR, NOT USED", "ERROR, NOT USED",
}; };
#endif /* CONFIG_IRDA_DEBUG */
int __init irlap_init(void) int __init irlap_init(void)
{ {

4
net/irda/irlap_event.c
View File

@ -78,8 +78,7 @@ static int irlap_state_sclose (struct irlap_cb *self, IRLAP_EVENT event,
static int irlap_state_reset_check(struct irlap_cb *, IRLAP_EVENT event, static int irlap_state_reset_check(struct irlap_cb *, IRLAP_EVENT event,
struct sk_buff *, struct irlap_info *); struct sk_buff *, struct irlap_info *);
#ifdef CONFIG_IRDA_DEBUG static const char *const irlap_event[] __maybe_unused = {
static const char *const irlap_event[] = {
"DISCOVERY_REQUEST", "DISCOVERY_REQUEST",
"CONNECT_REQUEST", "CONNECT_REQUEST",
"CONNECT_RESPONSE", "CONNECT_RESPONSE",
@ -119,7 +118,6 @@ static const char *const irlap_event[] = {
"BACKOFF_TIMER_EXPIRED", "BACKOFF_TIMER_EXPIRED",
"MEDIA_BUSY_TIMER_EXPIRED", "MEDIA_BUSY_TIMER_EXPIRED",
}; };
#endif /* CONFIG_IRDA_DEBUG */
const char *const irlap_state[] = { const char *const irlap_state[] = {
"LAP_NDM", "LAP_NDM",

4
net/irda/irlmp_event.c
View File

@ -48,8 +48,7 @@ const char *const irlsap_state[] = {
"LSAP_SETUP_PEND", "LSAP_SETUP_PEND",
}; };
#ifdef CONFIG_IRDA_DEBUG static const char *const irlmp_event[] __maybe_unused = {
static const char *const irlmp_event[] = {
"LM_CONNECT_REQUEST", "LM_CONNECT_REQUEST",
"LM_CONNECT_CONFIRM", "LM_CONNECT_CONFIRM",
"LM_CONNECT_RESPONSE", "LM_CONNECT_RESPONSE",
@ -75,7 +74,6 @@ static const char *const irlmp_event[] = {
"LM_LAP_DISCOVERY_CONFIRM", "LM_LAP_DISCOVERY_CONFIRM",
"LM_LAP_IDLE_TIMEOUT", "LM_LAP_IDLE_TIMEOUT",
}; };
#endif /* CONFIG_IRDA_DEBUG */
/* LAP Connection control proto declarations */ /* LAP Connection control proto declarations */
static void irlmp_state_standby (struct lap_cb *, IRLMP_EVENT, static void irlmp_state_standby (struct lap_cb *, IRLMP_EVENT,