From: Enrico Weigelt <info@metux.net>
Date: Wed, 5 Jun 2019 20:58:50 +0000 (+0200)
Subject: net: socket: drop unneeded likely() call around IS_ERR()
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4546e44ca2ec6fa3ca971ab6de3ef382f17ed544;p=uclinux-h8%2Flinux.git

net: socket: drop unneeded likely() call around IS_ERR()

IS_ERR() already calls unlikely(), so this extra likely() call
around the !IS_ERR() is not needed.

Signed-off-by: Enrico Weigelt <info@metux.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/socket.c b/net/socket.c
index 72372dc5dd70..0aa5a06f3698 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -435,7 +435,7 @@ static int sock_map_fd(struct socket *sock, int flags)
 	}
 
 	newfile = sock_alloc_file(sock, flags, NULL);
-	if (likely(!IS_ERR(newfile))) {
+	if (!IS_ERR(newfile)) {
 		fd_install(fd, newfile);
 		return fd;
 	}