media: uvcvideo: Use max() macro
authorRicardo Ribalda <ribalda@chromium.org>
Mon, 29 Apr 2024 15:04:43 +0000 (16:04 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 3 May 2024 10:06:06 +0000 (11:06 +0100)
It makes the code slightly more clear and makes cocci incredibly happy:

drivers/media/usb/uvc/uvc_ctrl.c:839:22-23: WARNING opportunity for max()

Link: https://lore.kernel.org/linux-media/20240429-fix-cocci-v3-4-3c4865f5a4b0@chromium.org
Reviewed-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/usb/uvc/uvc_ctrl.c

index e59a463c27618ebbce7618b754c56bb41be2db3b..f8ae14b8b4260ddd81d1824a01ddec4126f489e9 100644 (file)
@@ -836,7 +836,7 @@ static s32 uvc_get_le_value(struct uvc_control_mapping *mapping,
        while (1) {
                u8 byte = *data & mask;
                value |= offset > 0 ? (byte >> offset) : (byte << (-offset));
-               bits -= 8 - (offset > 0 ? offset : 0);
+               bits -= 8 - max(offset, 0);
                if (bits <= 0)
                        break;