From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 5 May 2023 11:45:24 +0000 (+0300)
Subject: media: uvcvideo: Use clamp() to replace manual implementation
X-Git-Tag: v6.6.17~4440^2~125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c5dfb2d912c005285682508447585c15aa7b765;p=platform%2Fkernel%2Flinux-rpi.git

media: uvcvideo: Use clamp() to replace manual implementation

The kernel has a nice clamp() macro, use it to replace a manual
implementation based on min() and max(). No functional change is
intended.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---

diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 445a7ae69b9b..9f89c781e885 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -437,9 +437,9 @@ static int uvc_parse_format(struct uvc_device *dev,
 		 */
 		n -= frame->bFrameIntervalType ? 1 : 2;
 		frame->dwDefaultFrameInterval =
-			min(frame->dwFrameInterval[n],
-			    max(frame->dwFrameInterval[0],
-				frame->dwDefaultFrameInterval));
+			clamp(frame->dwDefaultFrameInterval,
+			      frame->dwFrameInterval[0],
+			      frame->dwFrameInterval[n]);
 
 		if (dev->quirks & UVC_QUIRK_RESTRICT_FRAME_RATE) {
 			frame->bFrameIntervalType = 1;