wireguard: avoid double unlikely() notation when using IS_ERR()

The definition of IS_ERR() already applies the unlikely() notation
when checking the error status of the passed pointer. For this
reason there is no need to have the same notation outside of
IS_ERR() itself.

Clean up code by removing redundant notation.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c
index a3ed49cd95c31191f3412ee9309aa00b7876ba6f..cd51a2afa28ea6d26c7a20675442033f35ac6388 100644 (file)
--- a/drivers/net/wireguard/device.c
+++ b/drivers/net/wireguard/device.c
@@ -157,7 +157,7 @@ static netdev_tx_t wg_xmit(struct sk_buff *skb, struct net_device *dev)
        } else {
                struct sk_buff *segs = skb_gso_segment(skb, 0);
 
-               if (unlikely(IS_ERR(segs))) {
+               if (IS_ERR(segs)) {
                        ret = PTR_ERR(segs);
                        goto err_peer;
                }

diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c
index 410b318e57fb941140fb3e6161eb876fb0d7fa42..41430c0e465a963bf0144fbe1442ee9fa378d182 100644 (file)
--- a/drivers/net/wireguard/socket.c
+++ b/drivers/net/wireguard/socket.c
@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,
                                ip_rt_put(rt);
                        rt = ip_route_output_flow(sock_net(sock), &fl, sock);
                }
-               if (unlikely(IS_ERR(rt))) {
+               if (IS_ERR(rt)) {
                        ret = PTR_ERR(rt);
                        net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
                                            wg->dev->name, &endpoint->addr, ret);
@@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb,
                }
                dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl,
                                                      NULL);
-               if (unlikely(IS_ERR(dst))) {
+               if (IS_ERR(dst)) {
                        ret = PTR_ERR(dst);
                        net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
                                            wg->dev->name, &endpoint->addr, ret);