net/mlx5: Remove redundant unlikely()

tklauser · davem330 · commit 92978ee80184 · 2017-09-26T10:15:44.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/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c
@@ -256,7 +256,7 @@ struct sk_buff *mlx5e_ipsec_handle_tx_skb(struct net_device *netdev,
 			goto drop;
 		}
 	mdata = mlx5e_ipsec_add_metadata(skb);
-	if (unlikely(IS_ERR(mdata))) {
+	if (IS_ERR(mdata)) {
 		atomic64_inc(&priv->ipsec->sw_stats.ipsec_tx_drop_metadata);
 		goto drop;
 	}

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ struct sk_buff mlx5e_ipsec_handle_tx_skb(struct net_device netdev,`
`256`	`256`	`goto drop;`
`257`	`257`	`}`
`258`	`258`	`mdata = mlx5e_ipsec_add_metadata(skb);`
`259`		`- if (unlikely(IS_ERR(mdata))) {`
	`259`	`+ if (IS_ERR(mdata)) {`
`260`	`260`	`atomic64_inc(&priv->ipsec->sw_stats.ipsec_tx_drop_metadata);`
`261`	`261`	`goto drop;`
`262`	`262`	`}`