From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 9 Dec 2010 04:50:22 +0000 (+0000)
Subject: stmmac: Remove redundant unlikely()
X-Git-Tag: v2.6.38-rc1~476^2~260
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e51d67ebb8e109a0990a13dafa937fb469aa3fb;p=platform%2Fkernel%2Flinux-3.10.git

stmmac: Remove redundant unlikely()

IS_ERR() already implies unlikely(), so it can be omitted here.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index c0dc785..20f803d 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -949,7 +949,7 @@ static int stmmac_sw_tso(struct stmmac_priv *priv, struct sk_buff *skb)
 	       skb, skb->len);
 
 	segs = skb_gso_segment(skb, priv->dev->features & ~NETIF_F_TSO);
-	if (unlikely(IS_ERR(segs)))
+	if (IS_ERR(segs))
 		goto sw_tso_end;
 
 	do {