Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d9428de authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in drivers/net/ 



this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 7e99e9b6

drivers/net/8139cp.c

+4 −8
Original line number Diff line number Diff line
@@ -539,8 +539,7 @@ rx_status_loop: 
		unsigned buflen;



		skb = cp->rx_skb[rx_tail].skb;

		if (!skb)

			BUG();

		BUG_ON(!skb);



		desc = &cp->rx_ring[rx_tail];

		status = le32_to_cpu(desc->opts1);
@@ -723,8 +722,7 @@ static void cp_tx (struct cp_private *cp) 
			break;



		skb = cp->tx_skb[tx_tail].skb;

		if (!skb)

			BUG();

		BUG_ON(!skb);



		pci_unmap_single(cp->pdev, cp->tx_skb[tx_tail].mapping,

				 cp->tx_skb[tx_tail].len, PCI_DMA_TODEVICE);
@@ -1550,8 +1548,7 @@ static void cp_get_ethtool_stats (struct net_device *dev, 
	tmp_stats[i++] = le16_to_cpu(nic_stats->tx_abort);

	tmp_stats[i++] = le16_to_cpu(nic_stats->tx_underrun);

	tmp_stats[i++] = cp->cp_stats.rx_frags;

	if (i != CP_NUM_STATS)

		BUG();

	BUG_ON(i != CP_NUM_STATS);



	pci_free_consistent(cp->pdev, sizeof(*nic_stats), nic_stats, dma);

}
@@ -1856,8 +1853,7 @@ static void cp_remove_one (struct pci_dev *pdev) 
	struct net_device *dev = pci_get_drvdata(pdev);

	struct cp_private *cp = netdev_priv(dev);



	if (!dev)

		BUG();

	BUG_ON(!dev);

	unregister_netdev(dev);

	iounmap(cp->regs);

	if (cp->wol_enabled) pci_set_power_state (pdev, PCI_D0);

drivers/net/arcnet/arcnet.c

+1 −2
Original line number Diff line number Diff line
@@ -765,8 +765,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs) 
	BUGMSG(D_DURING, "in arcnet_interrupt\n");

	

	lp = dev->priv;

	if (!lp)

		BUG();

	BUG_ON(!lp);

		

	spin_lock(&lp->lock);

drivers/net/b44.c

+1 −2
Original line number Diff line number Diff line
@@ -608,8 +608,7 @@ static void b44_tx(struct b44 *bp) 
		struct ring_info *rp = &bp->tx_buffers[cons];

		struct sk_buff *skb = rp->skb;



		if (unlikely(skb == NULL))

			BUG();

		BUG_ON(skb == NULL);



		pci_unmap_single(bp->pdev,

				 pci_unmap_addr(rp, mapping),

drivers/net/chelsio/sge.c

+1 −2
Original line number Diff line number Diff line
@@ -1093,8 +1093,7 @@ static int process_responses(struct adapter *adapter, int budget) 
		if (likely(e->DataValid)) {

			struct freelQ *fl = &sge->freelQ[e->FreelistQid];



			if (unlikely(!e->Sop || !e->Eop))

				BUG();

			BUG_ON(!e->Sop || !e->Eop);

			if (unlikely(e->Offload))

				unexpected_offload(adapter, fl);

			else

drivers/net/e1000/e1000_main.c

+1 −2
Original line number Diff line number Diff line
@@ -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)) {