tipc: remove unnecessary variables and conditions

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 <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 9 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 3b61851bb927..32037c57937d 100644
--- 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);
 }
 
 /**