media: pci: saa7164-core.c: replace if (cond) BUG() with BUG_ON()
authorDaniel W. S. Almeida <dwlsalmeida@gmail.com>
Fri, 7 Aug 2020 08:35:38 +0000 (10:35 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Sat, 29 Aug 2020 05:50:03 +0000 (07:50 +0200)
Fix the following coccinelle reports:

drivers/media/pci/saa7164/saa7164-core.c:579:2-5:
WARNING: Use BUG_ON instead of if condition followed by BUG.

drivers/media/pci/saa7164/saa7164-core.c:592:3-6:
WARNING: Use BUG_ON instead of if condition followed by BUG.

drivers/media/pci/saa7164/saa7164-core.c:898:2-5:
WARNING: Use BUG_ON instead of if condition followed by BUG.

Found using - Coccinelle (http://coccinelle.lip6.fr)

Signed-off-by: Daniel W. S. Almeida <dwlsalmeida@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/pci/saa7164/saa7164-core.c

index 4b63789..6c08b77 100644 (file)
@@ -575,8 +575,8 @@ static irqreturn_t saa7164_irq_ts(struct saa7164_port *port)
 
        /* Find the current write point from the hardware */
        wp = saa7164_readl(port->bufcounter);
-       if (wp > (port->hwcfg.buffercount - 1))
-               BUG();
+
+       BUG_ON(wp > (port->hwcfg.buffercount - 1));
 
        /* Find the previous buffer to the current write point */
        if (wp == 0)
@@ -588,8 +588,8 @@ static irqreturn_t saa7164_irq_ts(struct saa7164_port *port)
        /* TODO: turn this into a worker thread */
        list_for_each_safe(c, n, &port->dmaqueue.list) {
                buf = list_entry(c, struct saa7164_buffer, list);
-               if (i++ > port->hwcfg.buffercount)
-                       BUG();
+               BUG_ON(i > port->hwcfg.buffercount);
+               i++;
 
                if (buf->idx == rp) {
                        /* Found the buffer, deal with it */
@@ -894,8 +894,7 @@ static int saa7164_port_init(struct saa7164_dev *dev, int portnr)
 {
        struct saa7164_port *port = NULL;
 
-       if ((portnr < 0) || (portnr >= SAA7164_MAX_PORTS))
-               BUG();
+       BUG_ON((portnr < 0) || (portnr >= SAA7164_MAX_PORTS));
 
        port = &dev->ports[portnr];
 
@@ -1563,4 +1562,3 @@ static void __exit saa7164_fini(void)
 
 module_init(saa7164_init);
 module_exit(saa7164_fini);
-