BUG_ON() Conversion in drivers/net/

[deliverable/linux.git] / drivers / net / e1000 / e1000_main.c

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index f39de16e6b9730769ab00cd759ba78c8fe6e86b5..add8dc4aa7b04b1510b43a5c4860fe21fd011aea 100644 (file)
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -920,7 +920,7 @@ e1000_remove(struct pci_dev *pdev)
        unregister_netdev(netdev);
 #ifdef CONFIG_E1000_NAPI
        for (i = 0; i < adapter->num_rx_queues; i++)
-               __dev_put(&adapter->polling_netdev[i]);
+               dev_put(&adapter->polling_netdev[i]);
 #endif
 
        if (!e1000_check_phy_reset_block(&adapter->hw))
@@ -3308,8 +3308,7 @@ e1000_clean(struct net_device *poll_dev, int *budget)
 
        while (poll_dev != &adapter->polling_netdev[i]) {
                i++;
-               if (unlikely(i == adapter->num_rx_queues))
-                       BUG();
+               BUG_ON(i == adapter->num_rx_queues);
        }
 
        if (likely(adapter->num_tx_queues == 1)) {