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

Commit b29f1428 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

tipc: remove calls to dbg() and msg_dbg() 



Eliminates obsolete calls to two of TIPC's main debugging macros, as well
as a pair of associated debugging routines that are no longer required.

Signed-off-by: default avatarAllan Stephens <Allan.Stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f5e75269

net/tipc/bcast.c

+0 −3
Original line number Diff line number Diff line
@@ -436,8 +436,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf) 
	u32 seqno;

	struct sk_buff *deferred;



	msg_dbg(msg, "<BC<<<");



	if (unlikely(!node || !tipc_node_is_up(node) || !node->bclink.supported ||

		     (msg_mc_netid(msg) != tipc_net_id))) {

		buf_discard(buf);
@@ -445,7 +443,6 @@ void tipc_bclink_recv_pkt(struct sk_buff *buf) 
	}



	if (unlikely(msg_user(msg) == BCAST_PROTOCOL)) {

		msg_dbg(msg, "<BCNACK<<<");

		if (msg_destnode(msg) == tipc_own_addr) {

			tipc_node_lock(node);

			tipc_bclink_acknowledge(node, msg_bcast_ack(msg));

net/tipc/bearer.c

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ int tipc_register_media(u32 media_type, 
	m_ptr->priority = bearer_priority;

	m_ptr->tolerance = link_tolerance;

	m_ptr->window = send_window_limit;

	dbg("Media <%s> registered\n", name);

	res = 0;

exit:

	write_unlock_bh(&tipc_net_lock);

net/tipc/config.c

+1 −3
Original line number Diff line number Diff line
@@ -65,10 +65,8 @@ int tipc_cfg_append_tlv(struct sk_buff *buf, int tlv_type, 
	struct tlv_desc *tlv = (struct tlv_desc *)skb_tail_pointer(buf);

	int new_tlv_space = TLV_SPACE(tlv_data_size);



	if (skb_tailroom(buf) < new_tlv_space) {

		dbg("tipc_cfg_append_tlv unable to append TLV\n");

	if (skb_tailroom(buf) < new_tlv_space)

		return 0;

	}

	skb_put(buf, new_tlv_space);

	tlv->tlv_type = htons(tlv_type);

	tlv->tlv_len  = htons(TLV_LENGTH(tlv_data_size));

net/tipc/core.h

+0 −4
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ u32 tipc_k_signal(Handler routine, unsigned long argument); 
static inline void k_init_timer(struct timer_list *timer, Handler routine,

				unsigned long argument)

{

	dbg("initializing timer %p\n", timer);

	setup_timer(timer, routine, argument);

}
@@ -263,7 +262,6 @@ static inline void k_init_timer(struct timer_list *timer, Handler routine, 


static inline void k_start_timer(struct timer_list *timer, unsigned long msec)

{

	dbg("starting timer %p for %u\n", timer, msec);

	mod_timer(timer, jiffies + msecs_to_jiffies(msec) + 1);

}
@@ -280,7 +278,6 @@ static inline void k_start_timer(struct timer_list *timer, unsigned long msec) 


static inline void k_cancel_timer(struct timer_list *timer)

{

	dbg("cancelling timer %p\n", timer);

	del_timer_sync(timer);

}
@@ -298,7 +295,6 @@ static inline void k_cancel_timer(struct timer_list *timer) 


static inline void k_term_timer(struct timer_list *timer)

{

	dbg("terminating timer %p\n", timer);

}

net/tipc/discover.c

+0 −4
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) 
	u32 type = msg_type(msg);



	msg_get_media_addr(msg,&media_addr);

	msg_dbg(msg, "RECV:");

	buf_discard(buf);



	if (net_id != tipc_net_id)
@@ -156,7 +155,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) 
		struct tipc_node *n_ptr = tipc_node_find(orig);

		int link_fully_up;



		dbg(" in own cluster\n");

		if (n_ptr == NULL) {

			n_ptr = tipc_node_create(orig);

			if (!n_ptr)
@@ -173,7 +171,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) 


		link = n_ptr->links[b_ptr->identity];

		if (!link) {

			dbg("creating link\n");

			link = tipc_link_create(b_ptr, orig, &media_addr);

			if (!link) {

				spin_unlock_bh(&n_ptr->lock);
@@ -198,7 +195,6 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr) 
			return;

		rbuf = tipc_disc_init_msg(DSC_RESP_MSG, 1, orig, b_ptr);

		if (rbuf != NULL) {

			msg_dbg(buf_msg(rbuf),"SEND:");

			b_ptr->media->send_msg(rbuf, &b_ptr->publ, &media_addr);

			buf_discard(rbuf);

		}