| Message ID | 20230506071427.28108-4-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: uvcvideo: Misc cleanups | expand |
On Sat, 6 May 2023 at 09:14, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > > 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> > --- > drivers/media/usb/uvc/uvc_driver.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c > index 1539eaf8f7d8..9e597bbbfe07 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; > -- > Regards, > > Laurent Pinchart >
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 1539eaf8f7d8..9e597bbbfe07 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;
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> --- drivers/media/usb/uvc/uvc_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)