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 445a7ae69b9b6821df76441d56e424f50d2c3afd..9f89c781e8851a57b946deb742004769b6793a34 100644 (file)
--- 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;