media: common: saa7146: replace BUG_ON by WARN_ON

No need for BUG_ON, WARN_ON is a lot friendlier.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index e50fa0ff7c5d5486fce4548e9fefa40f532bac6a..f15caf54771b94a3ceb46d0b8282dea50f74ec0a 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -37,7 +37,8 @@ void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data)
 {
        u32 value = 0;
 
-       BUG_ON(port > 3);
+       if (WARN_ON(port > 3))
+               return;
 
        value = saa7146_read(dev, GPIO_CTRL);
        value &= ~(0xff << (8*port));
@@ -148,7 +149,8 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
                pg = vmalloc_to_page(virt);
                if (NULL == pg)
                        goto err;
-               BUG_ON(PageHighMem(pg));
+               if (WARN_ON(PageHighMem(pg)))
+                       return NULL;
                sg_set_page(&sglist[i], pg, PAGE_SIZE, 0);
        }
        return sglist;
@@ -239,8 +241,9 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt
        int nr_pages = 0;
        int i,p;
 
-       BUG_ON(0 == sglen);
-       BUG_ON(list->offset > PAGE_SIZE);
+       if (WARN_ON(!sglen) ||
+           WARN_ON(list->offset > PAGE_SIZE))
+               return -EIO;
 
        /* if we have a user buffer, the first page may not be
           aligned to a page boundary. */

diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index faebe61a94084b5659bc7c96f698ad9c84e388f9..2154249a26d5a86fcb927f3973ff6da7fd39821e 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -68,7 +68,8 @@ int saa7146_buffer_queue(struct saa7146_dev *dev,
        assert_spin_locked(&dev->slock);
        DEB_EE("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf);
 
-       BUG_ON(!q);
+       if (WARN_ON(!q))
+               return -EIO;
 
        if (NULL == q->curr) {
                q->curr = buf;
@@ -109,7 +110,8 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
 {
        struct saa7146_buf *buf,*next = NULL;
 
-       BUG_ON(!q);
+       if (WARN_ON(!q))
+               return;
 
        DEB_INT("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi);
 

diff --git a/drivers/media/common/saa7146/saa7146_hlp.c b/drivers/media/common/saa7146/saa7146_hlp.c
index 98c339c33afaa65155be050c42730edd10444ef4..7569d8cdd4d8d75e0cdf59fd00e09fa8d6355160 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_hlp.c
+++ b/drivers/media/common/saa7146/saa7146_hlp.c
@@ -542,9 +542,10 @@ static int calculate_video_dma_grab_planar(struct saa7146_dev* dev, struct saa71
        int height = pix->height;
        enum v4l2_field field = pix->field;
 
-       BUG_ON(0 == buf->pt[0].dma);
-       BUG_ON(0 == buf->pt[1].dma);
-       BUG_ON(0 == buf->pt[2].dma);
+       if (WARN_ON(!buf->pt[0].dma) ||
+           WARN_ON(!buf->pt[1].dma) ||
+           WARN_ON(!buf->pt[2].dma))
+               return -1;
 
        DEB_CAP("[size=%dx%d,fields=%s]\n",
                width, height, v4l2_field_names[field]);