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

Commit 6dd44a74 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in drivers/isdn 



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 56ee4827

drivers/isdn/hisax/hisax_fcpcipnp.c

+2 −5
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs) 


	DBG(0x40, "hdlc_fill_fifo");



	if (skb->len == 0)

		BUG();

	BUG_ON(skb->len == 0);



	bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME;

	if (bcs->tx_skb->len > bcs->fifo_size) {
@@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg) 


	switch (pr) {

	case PH_DATA | REQUEST:

		if (bcs->tx_skb)

			BUG();

		

		BUG_ON(bcs->tx_skb);

		bcs->tx_skb = skb;

		DBG_SKB(1, skb);

		hdlc_fill_fifo(bcs);

drivers/isdn/hisax/hisax_isac.c

+3 −6
Original line number Diff line number Diff line
@@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *isac) 
	unsigned char cmd;

	u_char *ptr;



	if (!isac->tx_skb)

		BUG();

	BUG_ON(!isac->tx_skb);



	count = isac->tx_skb->len;

	if (count <= 0)

		BUG();

	BUG_ON(count <= 0);



	DBG(DBG_IRQ, "count %d", count);
@@ -859,8 +857,7 @@ void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg) 
			dev_kfree_skb(skb);

			break;

		}

		if (isac->tx_skb)

			BUG();

		BUG_ON(isac->tx_skb);



		isac->tx_skb = skb;

		isac_fill_fifo(isac);

drivers/isdn/hisax/st5481_b.c

+1 −3
Original line number Diff line number Diff line
@@ -356,9 +356,7 @@ void st5481_b_l2l1(struct hisax_if *ifc, int pr, void *arg) 


	switch (pr) {

	case PH_DATA | REQUEST:

		if (bcs->b_out.tx_skb)

			BUG();

		

		BUG_ON(bcs->b_out.tx_skb);

		bcs->b_out.tx_skb = skb;

		break;

	case PH_ACTIVATE | REQUEST:

drivers/isdn/hisax/st5481_d.c

+1 −3
Original line number Diff line number Diff line
@@ -596,9 +596,7 @@ void st5481_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg) 
		break;

	case PH_DATA | REQUEST:

		DBG(2, "PH_DATA REQUEST len %d", skb->len);

		if (adapter->d_out.tx_skb)

			BUG();



		BUG_ON(adapter->d_out.tx_skb);

		adapter->d_out.tx_skb = skb;

		FsmEvent(&adapter->d_out.fsm, EV_DOUT_START_XMIT, NULL);

		break;

drivers/isdn/i4l/isdn_ppp.c

+2 −4
Original line number Diff line number Diff line
@@ -974,8 +974,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf 
	int slot;

	int proto;



	if (net_dev->local->master)

		BUG(); // we're called with the master device always

	BUG_ON(net_dev->local->master); // we're called with the master device always



	slot = lp->ppp_slot;

	if (slot < 0 || slot >= ISDN_MAX_CHANNELS) {
@@ -2527,8 +2526,7 @@ static struct sk_buff *isdn_ppp_decompress(struct sk_buff *skb,struct ippp_struc 
		printk(KERN_DEBUG "ippp: no decompressor defined!\n");

		return skb;

	}

	if (!stat) // if we have a compressor, stat has been set as well

		BUG();

	BUG_ON(!stat); // if we have a compressor, stat has been set as well



	if((master && *proto == PPP_COMP) || (!master && *proto == PPP_COMPFRAG) ) {

		// compressed packets are compressed by their protocol type