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

tipc: remove extraneous braces from single statements 



Cleans up TIPC's source code to eliminate the presence of unnecessary
use of {} around single statements.

These changes are purely cosmetic and do not alter the operation of TIPC
in any way.

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 e3ec9c7d

net/tipc/bcast.c

+2 −4
Original line number Diff line number Diff line
@@ -196,9 +196,8 @@ static void bclink_retransmit_pkt(u32 after, u32 to) 
	struct sk_buff *buf;



	buf = bcl->first_out;

	while (buf && less_eq(buf_seqno(buf), after)) {

	while (buf && less_eq(buf_seqno(buf), after))

		buf = buf->next;

	}

	tipc_link_retransmit(bcl, buf, mod(to - after));

}
@@ -224,9 +223,8 @@ void tipc_bclink_acknowledge(struct tipc_node *n_ptr, u32 acked) 
	/* Skip over packets that node has previously acknowledged */



	crs = bcl->first_out;

	while (crs && less_eq(buf_seqno(crs), n_ptr->bclink.acked)) {

	while (crs && less_eq(buf_seqno(crs), n_ptr->bclink.acked))

		crs = crs->next;

	}



	/* Update packets that node is now acknowledging */

net/tipc/bearer.c

+1 −2
Original line number Diff line number Diff line
@@ -194,11 +194,10 @@ void tipc_media_addr_printf(struct print_buf *pb, struct tipc_media_addr *a) 
		unchar *addr = (unchar *)&a->dev_addr;



		tipc_printf(pb, "UNKNOWN(%u)", media_type);

		for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++) {

		for (i = 0; i < (sizeof(*a) - sizeof(a->type)); i++)

			tipc_printf(pb, "-%02x", addr[i]);

	}

}

}



/**

 * tipc_media_get_names - record names of registered media in buffer

net/tipc/link.c

+9 −16
Original line number Diff line number Diff line
@@ -615,9 +615,8 @@ static void link_state_event(struct link *l_ptr, unsigned event) 
		return;		/* Not yet. */



	if (link_blocked(l_ptr)) {

		if (event == TIMEOUT_EVT) {

		if (event == TIMEOUT_EVT)

			link_set_timer(l_ptr, cont_intv);

		}

		return;	  /* Changeover going on */

	}
@@ -940,11 +939,10 @@ int tipc_link_send(struct sk_buff *buf, u32 dest, u32 selector) 
	if (n_ptr) {

		tipc_node_lock(n_ptr);

		l_ptr = n_ptr->active_links[selector & 1];

		if (l_ptr) {

		if (l_ptr)

			res = tipc_link_send_buf(l_ptr, buf);

		} else {

		else

			buf_discard(buf);

		}

		tipc_node_unlock(n_ptr);

	} else {

		buf_discard(buf);
@@ -1626,9 +1624,8 @@ void tipc_recv_msg(struct sk_buff *head, struct tipc_bearer *tb_ptr) 


		/* Ensure message data is a single contiguous unit */



		if (unlikely(buf_linearize(buf))) {

		if (unlikely(buf_linearize(buf)))

			goto cont;

		}



		/* Handle arrival of a non-unicast link message */
@@ -1843,9 +1840,8 @@ u32 tipc_link_defer_pkt(struct sk_buff **head, 
				*head = buf;

			return 1;

		}

		if (seq_no == msg_seqno(msg)) {

		if (seq_no == msg_seqno(msg))

			break;

		}

		prev = crs;

		crs = crs->next;

	} while (crs);
@@ -1959,11 +1955,10 @@ void tipc_link_send_proto_msg(struct link *l_ptr, u32 msg_typ, int probe_msg, 
		msg_set_max_pkt(msg, l_ptr->max_pkt_target);

	}



	if (tipc_node_has_redundant_links(l_ptr->owner)) {

	if (tipc_node_has_redundant_links(l_ptr->owner))

		msg_set_redundant_link(msg);

	} else {

	else

		msg_clear_redundant_link(msg);

	}

	msg_set_linkprio(msg, l_ptr->priority);



	/* Ensure sequence number will not fit : */
@@ -2071,9 +2066,8 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf) 
		l_ptr->peer_bearer_id = msg_bearer_id(msg);



		/* Synchronize broadcast sequence numbers */

		if (!tipc_node_has_redundant_links(l_ptr->owner)) {

		if (!tipc_node_has_redundant_links(l_ptr->owner))

			l_ptr->owner->bclink.last_in = mod(msg_last_bcast(msg));

		}

		break;

	case STATE_MSG:
@@ -2108,10 +2102,9 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf) 
		max_pkt_ack = 0;

		if (msg_probe(msg)) {

			l_ptr->stats.recv_probes++;

			if (msg_size(msg) > sizeof(l_ptr->proto_msg)) {

			if (msg_size(msg) > sizeof(l_ptr->proto_msg))

				max_pkt_ack = msg_size(msg);

		}

		}



		/* Protocol message before retransmits, reduce loss risk */

net/tipc/msg.c

+6 −9
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) 
			tipc_printf(buf, "UNKNOWN ERROR(%x):",

				    msg_errcode(msg));

		}

	default:{}

	default:

		break;

	}



	tipc_printf(buf, "HZ(%u):", msg_hdr_sz(msg));
@@ -357,9 +358,8 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) 


	if (msg_non_seq(msg))

		tipc_printf(buf, "NOSEQ:");

	else {

	else

		tipc_printf(buf, "ACK(%u):", msg_ack(msg));

	}

	tipc_printf(buf, "BACK(%u):", msg_bcast_ack(msg));

	tipc_printf(buf, "PRND(%x)", msg_prevnode(msg));
@@ -387,10 +387,9 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) 
	if (msg_user(msg) == NAME_DISTRIBUTOR) {

		tipc_printf(buf, ":ONOD(%x):", msg_orignode(msg));

		tipc_printf(buf, ":DNOD(%x):", msg_destnode(msg));

		if (msg_routed(msg)) {

		if (msg_routed(msg))

			tipc_printf(buf, ":CSEQN(%u)", msg_transp_seqno(msg));

	}

	}



	if (msg_user(msg) ==  LINK_CONFIG) {

		u32 *raw = (u32 *)msg;
@@ -405,12 +404,10 @@ void tipc_msg_dbg(struct print_buf *buf, struct tipc_msg *msg, const char *str) 
		tipc_printf(buf, "TO(%u):", msg_bcgap_to(msg));

	}

	tipc_printf(buf, "\n");

	if ((usr == CHANGEOVER_PROTOCOL) && (msg_msgcnt(msg))) {

	if ((usr == CHANGEOVER_PROTOCOL) && (msg_msgcnt(msg)))

		tipc_msg_dbg(buf, msg_get_wrapped(msg), "      /");

	}

	if ((usr == MSG_FRAGMENTER) && (msg_type(msg) == FIRST_FRAGMENT)) {

	if ((usr == MSG_FRAGMENTER) && (msg_type(msg) == FIRST_FRAGMENT))

		tipc_msg_dbg(buf, msg_get_wrapped(msg), "      /");

}

}



#endif

net/tipc/name_table.c

+2 −4
Original line number Diff line number Diff line
@@ -751,9 +751,8 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper, 
	table.local_publ_count++;

	publ = tipc_nametbl_insert_publ(type, lower, upper, scope,

				   tipc_own_addr, port_ref, key);

	if (publ && (scope != TIPC_NODE_SCOPE)) {

	if (publ && (scope != TIPC_NODE_SCOPE))

		tipc_named_publish(publ);

	}

	write_unlock_bh(&tipc_nametbl_lock);

	return publ;

}
@@ -795,9 +794,8 @@ void tipc_nametbl_subscribe(struct subscription *s) 


	write_lock_bh(&tipc_nametbl_lock);

	seq = nametbl_find_seq(type);

	if (!seq) {

	if (!seq)

		seq = tipc_nameseq_create(type, &table.types[hash(type)]);

	}

	if (seq) {

		spin_lock_bh(&seq->lock);

		tipc_nameseq_subscribe(seq, s);

CRA Git | Maintained and supported by SUSTech CRA and CCSE