From 7c5dfb2d912c005285682508447585c15aa7b765 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 5 May 2023 14:45:24 +0300 Subject: 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 Reviewed-by: Ricardo Ribalda Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/uvc/uvc_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/media/usb/uvc/uvc_driver.c') 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; -- cgit v1.2.3