OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d9db5e3
)
bnxt_en: Remove redundant unlikely()
author
Tobias Klauser
<tklauser@distanz.ch>
Tue, 26 Sep 2017 13:12:26 +0000
(15:12 +0200)
committer
David S. Miller
<davem@davemloft.net>
Tue, 26 Sep 2017 17:15:44 +0000
(10:15 -0700)
IS_ERR() already implies unlikely(), so it can be omitted.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnxt/bnxt.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index
c25f5b5
..
5ba4993
100644
(file)
--- a/
drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/
drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@
-1491,7
+1491,7
@@
static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_napi *bnapi, u32 *raw_cons,
(struct rx_tpa_end_cmp *)rxcmp,
(struct rx_tpa_end_cmp_ext *)rxcmp1, event);
- if (
unlikely(IS_ERR(skb)
))
+ if (
IS_ERR(skb
))
return -EBUSY;
rc = -ENOMEM;