From: Gustavo A. R. Silva Date: Thu, 26 Oct 2017 12:16:01 +0000 (-0500) Subject: net: bcmgenet: Use BUG_ON instead of if condition followed by BUG X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4fa112f6b5fb055478e76f2b446673565d2ea35f;p=openwrt%2Fstaging%2Fblogic.git net: bcmgenet: Use BUG_ON instead of if condition followed by BUG 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 9713374ebf14..24b4f4ceceef 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1580,8 +1580,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 */