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/

1 files changed, 3 insertions, 6 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index a507b58550f1..d597758dd129 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -798,8 +798,7 @@ void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode)
         if (!mapping->assoc_mapping) {
                 mapping->assoc_mapping = buffer_mapping;
         } else {
-                if (mapping->assoc_mapping != buffer_mapping)
-                        BUG();
+                BUG_ON(mapping->assoc_mapping != buffer_mapping);
         }
         if (list_empty(&bh->b_assoc_buffers)) {
                 spin_lock(&buffer_mapping->private_lock);
@@ -1116,8 +1115,7 @@ grow_dev_page(struct block_device *bdev, sector_t block,
         if (!page)
                 return NULL;
 
-        if (!PageLocked(page))
-                BUG();
+        BUG_ON(!PageLocked(page));
 
         if (page_has_buffers(page)) {
                 bh = page_buffers(page);
@@ -1524,8 +1522,7 @@ void set_bh_page(struct buffer_head *bh,
                 struct page *page, unsigned long offset)
 {
         bh->b_page = page;
-        if (offset >= PAGE_SIZE)
-                BUG();
+        BUG_ON(offset >= PAGE_SIZE);
         if (PageHighMem(page))
                 /*
                  * This catches illegal uses and preserves the offset: