net: faraday: ftmac100: Use BUG_ON instead of if condition followed by BUG.
authorGustavo A. R. Silva <garsilva@embeddedor.com>
Thu, 26 Oct 2017 12:27:45 +0000 (07:27 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Oct 2017 14:53:14 +0000 (23:53 +0900)
Notice that in this particular case 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 <garsilva@embeddedor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/faraday/ftmac100.c

index 66928a922824fd24513941da53540d71e0dad8a4..aecc76504b69af5b39f01c026924e3d556b8c491 100644 (file)
@@ -402,6 +402,7 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)
        struct page *page;
        dma_addr_t map;
        int length;
+       bool ret;
 
        rxdes = ftmac100_rx_locate_first_segment(priv);
        if (!rxdes)
@@ -416,8 +417,8 @@ static bool ftmac100_rx_packet(struct ftmac100 *priv, int *processed)
         * It is impossible to get multi-segment packets
         * because we always provide big enough receive buffers.
         */
-       if (unlikely(!ftmac100_rxdes_last_segment(rxdes)))
-               BUG();
+       ret = ftmac100_rxdes_last_segment(rxdes);
+       BUG_ON(!ret);
 
        /* start processing */
        skb = netdev_alloc_skb_ip_align(netdev, 128);