| Message ID | 20170926092142.21156-1-tklauser@distanz.ch |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] datagram: Remove redundant unlikely() | expand |
From: Tobias Klauser <tklauser@distanz.ch> Date: Tue, 26 Sep 2017 11:21:42 +0200 > IS_ERR() already implies unlikely(), so it can be omitted. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Applied.
diff --git a/net/core/datagram.c b/net/core/datagram.c index f7fb7e3f2acf..0b7b4c22719e 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -188,7 +188,7 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk, } if (!skb->len) { skb = skb_set_peeked(skb); - if (unlikely(IS_ERR(skb))) { + if (IS_ERR(skb)) { *err = PTR_ERR(skb); return NULL; }
IS_ERR() already implies unlikely(), so it can be omitted. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- net/core/datagram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)