12 files changed, 15 insertions, 30 deletions

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index ee16c042ef6e..8cdd4d265ffa 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -116,8 +116,7 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
                 pg = vmalloc_to_page(virt);
                 if (NULL == pg)
                         goto err;
-                if (PageHighMem(pg))
-                        BUG();
+                BUG_ON(PageHighMem(pg));
                 sglist[i].page   = pg;
                 sglist[i].length = PAGE_SIZE;
         }
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index dc7fb20f47b5..3870fa948cc0 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -37,8 +37,7 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits)
         struct saa7146_dev *dev = fh->dev;
         struct saa7146_vv *vv = dev->vv_data;
 
-        if ((fh->resources & bits) != bits)
-                BUG();
+        BUG_ON((fh->resources & bits) != bits);
 
         mutex_lock(&dev->lock);
         fh->resources  &= ~bits;
@@ -55,8 +54,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct saa7146_buf *buf)
 {
         DEB_EE(("dev:%p, buf:%p\n",dev,buf));
 
-        if (in_interrupt())
-                BUG();
+        BUG_ON(in_interrupt());
 
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma);
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index aef4f58d712d..7497b1e8d883 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1090,11 +1090,9 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
         struct av7110 *av7110;
 
         /* pointer casting paranoia... */
-        if (!demux)
-                BUG();
+        BUG_ON(!demux);
         dvbdemux = (struct dvb_demux *) demux->priv;
-        if (!dvbdemux)
-                BUG();
+        BUG_ON(!dvbdemux);
         av7110 = (struct av7110 *) dvbdemux->priv;
 
         dprintk(4, "%p\n", av7110);
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index ecb15d4ecf81..248fdc7accfb 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -688,8 +688,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
                                 memcpy(ttusb->muxpack + ttusb->muxpack_ptr,
                                        data, avail);
                                 ttusb->muxpack_ptr += avail;
-                                if (ttusb->muxpack_ptr > 264)
-                                        BUG();
+                                BUG_ON(ttusb->muxpack_ptr > 264);
                                 data += avail;
                                 len -= avail;
                                 /* determine length */
diff --git a/drivers/media/video/bttv-risc.c b/drivers/media/video/bttv-risc.c
index 5c746110df62..344f84e9af04 100644
--- a/drivers/media/video/bttv-risc.c
+++ b/drivers/media/video/bttv-risc.c
@@ -511,8 +511,7 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc,
 void
 bttv_dma_free(struct bttv *btv, struct bttv_buffer *buf)
 {
-        if (in_interrupt())
-                BUG();
+        BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_pci_unmap(btv->c.pci, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 25be3a976d09..c2cdbafdb77b 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -215,8 +215,7 @@ int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 void
 cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf)
 {
-        if (in_interrupt())
-                BUG();
+        BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_pci_unmap(pci, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index b1892dff0fe8..6c97aa740d27 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -366,8 +366,7 @@ static
 void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits)
 {
         struct cx88_core *core = dev->core;
-        if ((fh->resources & bits) != bits)
-                BUG();
+        BUG_ON((fh->resources & bits) != bits);
 
         mutex_lock(&core->lock);
         fh->resources  &= ~bits;
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 614f7b923403..64e2c108df34 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -308,8 +308,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 
 static int dsp_buffer_free(struct saa7134_dev *dev)
 {
-        if (!dev->dmasound.blksize)
-                BUG();
+        BUG_ON(!dev->dmasound.blksize);
 
         videobuf_dma_free(&dev->dmasound.dma);
 
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index f5f2cf5d1507..be85e0b0cbb0 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -256,8 +256,7 @@ void saa7134_pgtable_free(struct pci_dev *pci, struct saa7134_pgtable *pt)
 
 void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf)
 {
-        if (in_interrupt())
-                BUG();
+        BUG_ON(in_interrupt());
 
         videobuf_waiton(&buf->vb,0,0);
         videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma);
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 80e34a5fdcc5..d79d05f88705 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -84,8 +84,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 {
         int err;
 
-        if (!dev->dmasound.bufsize)
-                BUG();
+        BUG_ON(!dev->dmasound.bufsize);
         videobuf_dma_init(&dev->dmasound.dma);
         err = videobuf_dma_init_kernel(&dev->dmasound.dma, PCI_DMA_FROMDEVICE,
                                        (dev->dmasound.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
@@ -96,8 +95,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
 
 static int dsp_buffer_free(struct saa7134_dev *dev)
 {
-        if (!dev->dmasound.blksize)
-                BUG();
+        BUG_ON(!dev->dmasound.blksize);
         videobuf_dma_free(&dev->dmasound.dma);
         dev->dmasound.blocks  = 0;
         dev->dmasound.blksize = 0;
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 72f389a51a13..600c3c7e3dca 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -489,8 +489,7 @@ int res_locked(struct saa7134_dev *dev, unsigned int bit)
 static
 void res_free(struct saa7134_dev *dev, struct saa7134_fh *fh, unsigned int bits)
 {
-        if ((fh->resources & bits) != bits)
-                BUG();
+        BUG_ON((fh->resources & bits) != bits);
 
         mutex_lock(&dev->lock);
         fh->resources  &= ~bits;
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index cb1c228e29f8..a8918e839f65 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -59,8 +59,7 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
                 pg = vmalloc_to_page(virt);
                 if (NULL == pg)
                         goto err;
-                if (PageHighMem(pg))
-                        BUG();
+                BUG_ON(PageHighMem(pg));
                 sglist[i].page   = pg;
                 sglist[i].length = PAGE_SIZE;
         }