kcm: Remove redundant unlikely()

tklauser · davem330 · commit d9db5e3680c8 · 2017-09-26T09:54:06.000-07:00
IS_ERR() already implies unlikely(), so it can be omitted.

Signed-off-by: Tobias Klauser &lt;tklauser@distanz.ch&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
@@ -1650,7 +1650,7 @@ static int kcm_clone(struct socket *osock, struct kcm_clone *info,
 	}
 
 	newfile = sock_alloc_file(newsock, 0, osock->sk->sk_prot_creator->name);
-	if (unlikely(IS_ERR(newfile))) {
+	if (IS_ERR(newfile)) {
 		err = PTR_ERR(newfile);
 		goto out_sock_alloc_fail;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1650,7 +1650,7 @@ static int kcm_clone(struct socket osock, struct kcm_clone info,`
`1650`	`1650`	`}`
`1651`	`1651`
`1652`	`1652`	`newfile = sock_alloc_file(newsock, 0, osock->sk->sk_prot_creator->name);`
`1653`		`- if (unlikely(IS_ERR(newfile))) {`
	`1653`	`+ if (IS_ERR(newfile)) {`
`1654`	`1654`	`err = PTR_ERR(newfile);`
`1655`	`1655`	`goto out_sock_alloc_fail;`
`1656`	`1656`	`}`