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

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits)
  BUG_ON() Conversion in drivers/video/
  BUG_ON() Conversion in drivers/parisc/
  BUG_ON() Conversion in drivers/block/
  BUG_ON() Conversion in sound/sparc/cs4231.c
  BUG_ON() Conversion in drivers/s390/block/dasd.c
  BUG_ON() Conversion in lib/swiotlb.c
  BUG_ON() Conversion in kernel/cpu.c
  BUG_ON() Conversion in ipc/msg.c
  BUG_ON() Conversion in block/elevator.c
  BUG_ON() Conversion in fs/coda/
  BUG_ON() Conversion in fs/binfmt_elf_fdpic.c
  BUG_ON() Conversion in input/serio/hil_mlc.c
  BUG_ON() Conversion in md/dm-hw-handler.c
  BUG_ON() Conversion in md/bitmap.c
  The comment describing how MS_ASYNC works in msync.c is confusing
  rcu: undeclared variable used in documentation
  fix typos "wich" -> "which"
  typo patch for fs/ufs/super.c
  Fix simple typos
  tabify drivers/char/Makefile
  ...

4 files changed, 4 insertions, 7 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 37b8cda3e8bc..9bdea2a5cf0e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
         void *cpu_end = loaf->cpu_free + len;
         void *cpu_addr = loaf->cpu_free;
 
-        if (cpu_end > loaf->cpu_base + loaf->length)
-                BUG();
+        BUG_ON(cpu_end > loaf->cpu_base + loaf->length);
         *dma_handle = loaf->dma_free;
         loaf->cpu_free = cpu_end;
         loaf->dma_free += len;
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 1f2890989b56..71ec9e664383 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2361,8 +2361,7 @@ queue:
         if (!creq)
                 goto startio;
 
-        if (creq->nr_phys_segments > MAXSGENTRIES)
-                BUG();
+        BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
 
         if (( c = cmd_alloc(h, 1)) == NULL)
                 goto full;
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index 9e35de05d5c5..0e66e904bd8c 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
 
         cp->Request.Timeout = 0;
         memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
-        if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG();
+        BUG_ON(cmd->cmd_len > sizeof(cp->Request.CDB));
         cp->Request.CDBLen = cmd->cmd_len;
         memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len);
         cp->Request.Type.Type = TYPE_CMD;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 862b9abac0ae..b6ea2f0c7276 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -906,8 +906,7 @@ queue_next:
         if (!creq)
                 goto startio;
 
-        if (creq->nr_phys_segments > SG_MAX)
-                BUG();
+        BUG_ON(creq->nr_phys_segments > SG_MAX);
 
         if ((c = cmd_alloc(h,1)) == NULL)
                 goto startio;