[PATCH] net: bcmgenet: Use BUG_ON instead of if condition followed by BUG

Subsystems: broadcom genet ethernet driver, networking drivers, the rest

STALE3211d

2 messages, 2 authors, 2017-10-27 · open the first message on its own page

[PATCH] net: bcmgenet: Use BUG_ON instead of if condition followed by BUG

From: Gustavo A. R. Silva <hidden>
Date: 2017-10-26 12:16:12

Use BUG_ON instead of if condition followed by BUG.

Something to notice in this particular case is that unlikely()
is already being called inside BUG_ON macro.

This issue was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <redacted>
---
 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 9cebca8..0d1cb06 100644
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1584,8 +1584,7 @@ static netdev_tx_t bcmgenet_xmit(struct sk_buff *skb, struct net_device *dev)
 	for (i = 0; i <= nr_frags; i++) {
 		tx_cb_ptr = bcmgenet_get_txcb(priv, ring);
 
-		if (unlikely(!tx_cb_ptr))
-			BUG();
+		BUG_ON(!tx_cb_ptr);
 
 		if (!i) {
 			/* Transmit single SKB or head of fragment list */
-- 
2.7.4

Re: [PATCH] net: bcmgenet: Use BUG_ON instead of if condition followed by BUG

From: David Miller <davem@davemloft.net>
Date: 2017-10-27 14:56:20

From: "Gustavo A. R. Silva" <redacted>
Date: Thu, 26 Oct 2017 07:16:01 -0500
Use BUG_ON instead of if condition followed by BUG.

Something to notice in this particular case is that unlikely()
is already being called inside BUG_ON macro.

This issue was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <redacted>
Applied.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help