tipc: remove unnecessary variables and conditions

wangweidong · davem330 · commit 0cee6bbe06f6 · 2013-12-16T12:48:35.000-05:00
We remove a number of unnecessary variables and branches
in TIPC. This patch is cosmetic and does not change the
operation of TIPC in any way.

Reviewed-by: Jon Maloy &lt;jon.maloy@ericsson.com&gt;
Reviewed-by: Erik Hugne &lt;erik.hugne@ericsson.com&gt;
Signed-off-by: Wang Weidong &lt;wangweidong1@huawei.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
@@ -148,8 +148,7 @@ static struct publication *publ_create(u32 type, u32 lower, u32 upper,
  */
 static struct sub_seq *tipc_subseq_alloc(u32 cnt)
 {
-	struct sub_seq *sseq = kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);
-	return sseq;
+	return kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);
 }
 
 /**
diff --git a/net/tipc/port.c b/net/tipc/port.c
@@ -832,17 +832,14 @@ int __tipc_connect(u32 ref, struct tipc_port *p_ptr,
  */
 int __tipc_disconnect(struct tipc_port *tp_ptr)
 {
-	int res;
-
 	if (tp_ptr->connected) {
 		tp_ptr->connected = 0;
 		/* let timer expire on it's own to avoid deadlock! */
 		tipc_nodesub_unsubscribe(&tp_ptr->subscription);
-		res = 0;
-	} else {
-		res = -ENOTCONN;
+		return 0;
 	}
-	return res;
+
+	return -ENOTCONN;
 }
 
 /*
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
@@ -239,7 +239,6 @@ static int tipc_sk_create(struct net *net, struct socket *sock, int protocol,
 int tipc_sock_create_local(int type, struct socket **res)
 {
 	int rc;
-	struct sock *sk;
 
 	rc = sock_create_lite(AF_TIPC, type, 0, res);
 	if (rc < 0) {
@@ -248,8 +247,6 @@ int tipc_sock_create_local(int type, struct socket **res)
 	}
 	tipc_sk_create(&init_net, *res, 0, 1);
 
-	sk = (*res)->sk;
-
 	return 0;
 }
 
@@ -1311,14 +1308,12 @@ static u32 filter_connect(struct tipc_sock *tsock, struct sk_buff **buf)
 static unsigned int rcvbuf_limit(struct sock *sk, struct sk_buff *buf)
 {
 	struct tipc_msg *msg = buf_msg(buf);
-	unsigned int limit;
 
 	if (msg_connected(msg))
-		limit = sysctl_tipc_rmem[2];
-	else
-		limit = sk->sk_rcvbuf >> TIPC_CRITICAL_IMPORTANCE <<
-			msg_importance(msg);
-	return limit;
+		return sysctl_tipc_rmem[2];
+
+	return sk->sk_rcvbuf >> TIPC_CRITICAL_IMPORTANCE <<
+		msg_importance(msg);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -148,8 +148,7 @@ static struct publication *publ_create(u32 type, u32 lower, u32 upper,`
`148`	`148`	`*/`
`149`	`149`	`static struct sub_seq *tipc_subseq_alloc(u32 cnt)`
`150`	`150`	`{`
`151`		`- struct sub_seq *sseq = kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);`
`152`		`- return sseq;`
	`151`	`+ return kcalloc(cnt, sizeof(struct sub_seq), GFP_ATOMIC);`
`153`	`152`	`}`
`154`	`153`
`155`	`154`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,6 @@ static int tipc_sk_create(struct net net, struct socket sock, int protocol,`
`239`	`239`	`int tipc_sock_create_local(int type, struct socket **res)`
`240`	`240`	`{`
`241`	`241`	`int rc;`
`242`		`- struct sock *sk;`
`243`	`242`
`244`	`243`	`rc = sock_create_lite(AF_TIPC, type, 0, res);`
`245`	`244`	`if (rc < 0) {`
`@@ -248,8 +247,6 @@ int tipc_sock_create_local(int type, struct socket **res)`
`248`	`247`	`}`
`249`	`248`	`tipc_sk_create(&init_net, *res, 0, 1);`
`250`	`249`
`251`		`- sk = (*res)->sk;`
`252`		`-`
`253`	`250`	`return 0;`
`254`	`251`	`}`
`255`	`252`
`@@ -1311,14 +1308,12 @@ static u32 filter_connect(struct tipc_sock tsock, struct sk_buff *buf)`
`1311`	`1308`	`static unsigned int rcvbuf_limit(struct sock sk, struct sk_buff buf)`
`1312`	`1309`	`{`
`1313`	`1310`	`struct tipc_msg *msg = buf_msg(buf);`
`1314`		`- unsigned int limit;`
`1315`	`1311`
`1316`	`1312`	`if (msg_connected(msg))`
`1317`		`- limit = sysctl_tipc_rmem[2];`
`1318`		`- else`
`1319`		`- limit = sk->sk_rcvbuf >> TIPC_CRITICAL_IMPORTANCE <<`
`1320`		`- msg_importance(msg);`
`1321`		`- return limit;`
	`1313`	`+ return sysctl_tipc_rmem[2];`
	`1314`	`+`
	`1315`	`+ return sk->sk_rcvbuf >> TIPC_CRITICAL_IMPORTANCE <<`
	`1316`	`+ msg_importance(msg);`
`1322`	`1317`	`}`
`1323`	`1318`
`1324`	`1319`	`/**`