media: s2255drv: Remove unneeded if else blocks

Given the following definitions from s2255drv.c

 #define LINE_SZ_4CIFS_NTSC      640
 #define LINE_SZ_2CIFS_NTSC      640
 #define LINE_SZ_1CIFS_NTSC      320

and

 #define LINE_SZ_4CIFS_PAL       704
 #define LINE_SZ_2CIFS_PAL       704
 #define LINE_SZ_1CIFS_PAL       352

f->fmt.pix.width possible values can be reduced to
LINE_SZ_4CIFS_NTSC or LINE_SZ_1CIFS_NTSC.

This patch removes unneeded if else blocks in vidioc_try_fmt_vid_cap
function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Christopher Díaz Riveros <chrisadr@gentoo.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 8c2a86d71e8a8f49d0880181d5b435b6fad6505b..a00a15f55d3787ee5c3e0a772de86f92f724592e 100644 (file)
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -803,10 +803,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                }
                if (f->fmt.pix.width >= LINE_SZ_4CIFS_NTSC)
                        f->fmt.pix.width = LINE_SZ_4CIFS_NTSC;
-               else if (f->fmt.pix.width >= LINE_SZ_2CIFS_NTSC)
-                       f->fmt.pix.width = LINE_SZ_2CIFS_NTSC;
-               else if (f->fmt.pix.width >= LINE_SZ_1CIFS_NTSC)
-                       f->fmt.pix.width = LINE_SZ_1CIFS_NTSC;
                else
                        f->fmt.pix.width = LINE_SZ_1CIFS_NTSC;
        } else {
@@ -820,10 +816,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                }
                if (f->fmt.pix.width >= LINE_SZ_4CIFS_PAL)
                        f->fmt.pix.width = LINE_SZ_4CIFS_PAL;
-               else if (f->fmt.pix.width >= LINE_SZ_2CIFS_PAL)
-                       f->fmt.pix.width = LINE_SZ_2CIFS_PAL;
-               else if (f->fmt.pix.width >= LINE_SZ_1CIFS_PAL)
-                       f->fmt.pix.width = LINE_SZ_1CIFS_PAL;
                else
                        f->fmt.pix.width = LINE_SZ_1CIFS_PAL;
        }