Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a768851f authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

irda: Fix build failures after IRDA_DEBUG->pr_debug 



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

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d3c9d37

net/irda/ircomm/ircomm_event.c

+1 −3
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ const char *const ircomm_state[] = { 
	"IRCOMM_CONN",

};



#ifdef CONFIG_IRDA_DEBUG

static const char *const ircomm_event[] = {

static const char *const ircomm_event[] __maybe_unused = {

	"IRCOMM_CONNECT_REQUEST",

	"IRCOMM_CONNECT_RESPONSE",

	"IRCOMM_TTP_CONNECT_INDICATION",
@@ -73,7 +72,6 @@ static const char *const ircomm_event[] = { 
	"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) =

net/irda/ircomm/ircomm_tty_attach.c

+1 −3
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ const char *const ircomm_tty_state[] = { 
	"*** ERROR *** ",

};



#ifdef CONFIG_IRDA_DEBUG

static const char *const ircomm_tty_event[] = {

static const char *const ircomm_tty_event[] __maybe_unused = {

	"IRCOMM_TTY_ATTACH_CABLE",

	"IRCOMM_TTY_DETACH_CABLE",

	"IRCOMM_TTY_DATA_REQUEST",
@@ -106,7 +105,6 @@ static const char *const ircomm_tty_event[] = { 
	"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) =

net/irda/iriap.c

+1 −3
Original line number Diff line number Diff line
@@ -43,9 +43,8 @@ 
#include <net/irda/iriap_event.h>

#include <net/irda/iriap.h>



#ifdef CONFIG_IRDA_DEBUG

/* 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_ISO_8859_1",

	"CS_ISO_8859_2",
@@ -58,7 +57,6 @@ static const char *const ias_charset_types[] = { 
	"CS_ISO_8859_9",

	"CS_UNICODE"

};

#endif	/* CONFIG_IRDA_DEBUG */



static hashbin_t *iriap = NULL;

static void *service_handle;

net/irda/irlap.c

+1 −3
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ static void __irlap_close(struct irlap_cb *self); 
static void irlap_init_qos_capabilities(struct irlap_cb *self,

					struct qos_info *qos_user);



#ifdef CONFIG_IRDA_DEBUG

static const char *const lap_reasons[] = {

static const char *const lap_reasons[] __maybe_unused = {

	"ERROR, NOT USED",

	"LAP_DISC_INDICATION",

	"LAP_NO_RESPONSE",
@@ -71,7 +70,6 @@ static const char *const lap_reasons[] = { 
	"LAP_PRIMARY_CONFLICT",

	"ERROR, NOT USED",

};

#endif	/* CONFIG_IRDA_DEBUG */



int __init irlap_init(void)

{

net/irda/irlap_event.c

+1 −3
Original line number Diff line number Diff line
@@ -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,

				   struct sk_buff *, struct irlap_info *);



#ifdef CONFIG_IRDA_DEBUG

static const char *const irlap_event[] = {

static const char *const irlap_event[] __maybe_unused = {

	"DISCOVERY_REQUEST",

	"CONNECT_REQUEST",

	"CONNECT_RESPONSE",
@@ -119,7 +118,6 @@ static const char *const irlap_event[] = { 
	"BACKOFF_TIMER_EXPIRED",

	"MEDIA_BUSY_TIMER_EXPIRED",

};

#endif	/* CONFIG_IRDA_DEBUG */



const char *const irlap_state[] = {

	"LAP_NDM",