Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment
  Kconfig help: MTD_JEDECPROBE already supports Intel
  Remove ugly debugging stuff
  do_mounts.c: Minor ROOT_DEV comment cleanup
  BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c
  BUG_ON() Conversion in mm/mempool.c
  BUG_ON() Conversion in mm/memory.c
  BUG_ON() Conversion in kernel/fork.c
  BUG_ON() Conversion in ipc/sem.c
  BUG_ON() Conversion in fs/ext2/
  BUG_ON() Conversion in fs/hfs/
  BUG_ON() Conversion in fs/dcache.c
  BUG_ON() Conversion in fs/buffer.c
  BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
  BUG_ON() Conversion in md/dm-table.c
  BUG_ON() Conversion in md/dm-path-selector.c
  BUG_ON() Conversion in drivers/isdn
  BUG_ON() Conversion in drivers/char
  BUG_ON() Conversion in drivers/mtd/

5 files changed, 9 insertions, 21 deletions

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index dc7ef957e897..dbcca287ee2c 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -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);
diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c
index f4972f6c1f5d..81eac344bb03 100644
--- a/drivers/isdn/hisax/hisax_isac.c
+++ b/drivers/isdn/hisax/hisax_isac.c
@@ -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);
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
index 657817a591fe..22fd5db18d48 100644
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -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:
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c
index 941f7022ada1..493dc94992e5 100644
--- a/drivers/isdn/hisax/st5481_d.c
+++ b/drivers/isdn/hisax/st5481_d.c
@@ -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;
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index b9fed8a3bcc6..a0927d1b7a0c 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -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