media: stk1160: Use min macro
authorRicardo Ribalda <ribalda@chromium.org>
Mon, 29 Apr 2024 15:04:58 +0000 (16:04 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 3 May 2024 10:14:15 +0000 (11:14 +0100)
Instead of a custom min() implementation, use the real macro.

Mitigates the following cocci WARNINGs:
drivers/media/usb/stk1160/stk1160-video.c:133:12-13: WARNING opportunity for min()
drivers/media/usb/stk1160/stk1160-video.c:176:13-14: WARNING opportunity for min()

Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-19-3c4865f5a4b0@chromium.org
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/usb/stk1160/stk1160-video.c

index e79c45db60ab5639de37e2ed7181c2a5a76f0b4d..9cbd957ecc9082088afa3517b1f26de3c1f77960 100644 (file)
@@ -130,10 +130,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len)
        dst += linesdone * bytesperline * 2 + lineoff;
 
        /* Copy the remaining of current line */
-       if (remain < (bytesperline - lineoff))
-               lencopy = remain;
-       else
-               lencopy = bytesperline - lineoff;
+       lencopy = min(remain, bytesperline - lineoff);
 
        /*
         * Check if we have enough space left in the buffer.
@@ -178,10 +175,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len)
                src += lencopy;
 
                /* Copy one line at a time */
-               if (remain < bytesperline)
-                       lencopy = remain;
-               else
-                       lencopy = bytesperline;
+               lencopy = min(remain, bytesperline);
 
                /*
                 * Check if we have enough space left in the buffer.