From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Ricardo Ribalda <ribalda@chromium.org>
Cc: Hans de Goede <hdegoede@redhat.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] media: uvcvideo: Remove duplicated cap/out code
Date: Thu, 28 Nov 2024 22:46:19 +0200 [thread overview]
Message-ID: <20241128204619.GB25731@pendragon.ideasonboard.com> (raw)
In-Reply-To: <CANiDSCt69HXfRmWHKGELWoUE45bZeWUgVc3C7=aAvykUYZBUzQ@mail.gmail.com>
On Thu, Nov 28, 2024 at 09:36:06PM +0100, Ricardo Ribalda wrote:
> On Thu, 28 Nov 2024 at 21:31, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> >
> > On Thu, Nov 28, 2024 at 10:24:42PM +0200, Laurent Pinchart wrote:
> > > Hi Ricardo,
> > >
> > > Thank you for the patch.
> > >
> > > On Wed, Nov 27, 2024 at 07:31:29AM +0000, Ricardo Ribalda wrote:
> > > > The *_vid_cap and *_vid_out helpers seem to be identical. Remove all the
> > > > duplicated code.
> > > >
> > > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
> > > > ---
> > > > Unless I miss something, cap and out helpers are identical. So there is
> > > > no need to duplicate code
> > > > ---
> > > > drivers/media/usb/uvc/uvc_v4l2.c | 112 ++++++++-------------------------------
> > > > 1 file changed, 22 insertions(+), 90 deletions(-)
> > > >
> > > > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
> > > > index 97c5407f6603..11ccdaf0269f 100644
> > > > --- a/drivers/media/usb/uvc/uvc_v4l2.c
> > > > +++ b/drivers/media/usb/uvc/uvc_v4l2.c
> > > > @@ -361,9 +361,11 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
> > > > return ret;
> > > > }
> > > >
> > > > -static int uvc_v4l2_get_format(struct uvc_streaming *stream,
> > > > - struct v4l2_format *fmt)
> > > > +static int uvc_ioctl_g_fmt(struct file *file, void *fh,
> > > > + struct v4l2_format *fmt)
> > > > {
> > > > + struct uvc_fh *handle = fh;
> > > > + struct uvc_streaming *stream = handle->stream;
> > > > const struct uvc_format *format;
> > > > const struct uvc_frame *frame;
> > > > int ret = 0;
> > > > @@ -395,9 +397,11 @@ static int uvc_v4l2_get_format(struct uvc_streaming *stream,
> > > > return ret;
> > > > }
> > > >
> > > > -static int uvc_v4l2_set_format(struct uvc_streaming *stream,
> > > > - struct v4l2_format *fmt)
> > > > +static int uvc_ioctl_s_fmt(struct file *file, void *fh,
> > > > + struct v4l2_format *fmt)
> > > > {
> > > > + struct uvc_fh *handle = fh;
> > > > + struct uvc_streaming *stream = handle->stream;
> > > > struct uvc_streaming_control probe;
> > > > const struct uvc_format *format;
> > > > const struct uvc_frame *frame;
> > > > @@ -685,11 +689,13 @@ static int uvc_ioctl_querycap(struct file *file, void *fh,
> > > > return 0;
> > > > }
> > > >
> > > > -static int uvc_ioctl_enum_fmt(struct uvc_streaming *stream,
> > > > +static int uvc_ioctl_enum_fmt(struct file *file, void *fh,
> > > > struct v4l2_fmtdesc *fmt)
> > > > {
> > > > - const struct uvc_format *format;
> > > > + struct uvc_fh *handle = fh;
> > > > + struct uvc_streaming *stream = handle->stream;
> > > > enum v4l2_buf_type type = fmt->type;
> > > > + const struct uvc_format *format;
> > > > u32 index = fmt->index;
> > > >
> > > > if (fmt->type != stream->type || fmt->index >= stream->nformats)
> > > > @@ -707,82 +713,8 @@ static int uvc_ioctl_enum_fmt(struct uvc_streaming *stream,
> > > > return 0;
> > > > }
> > > >
> > > > -static int uvc_ioctl_enum_fmt_vid_cap(struct file *file, void *fh,
> > > > - struct v4l2_fmtdesc *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > -
> > > > - return uvc_ioctl_enum_fmt(stream, fmt);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_enum_fmt_vid_out(struct file *file, void *fh,
> > > > - struct v4l2_fmtdesc *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > -
> > > > - return uvc_ioctl_enum_fmt(stream, fmt);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_g_fmt_vid_cap(struct file *file, void *fh,
> > > > - struct v4l2_format *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > -
> > > > - return uvc_v4l2_get_format(stream, fmt);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_g_fmt_vid_out(struct file *file, void *fh,
> > > > - struct v4l2_format *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > -
> > > > - return uvc_v4l2_get_format(stream, fmt);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_s_fmt_vid_cap(struct file *file, void *fh,
> > > > - struct v4l2_format *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > - int ret;
> > > > -
> > > > - ret = uvc_acquire_privileges(handle);
> > > > - if (ret < 0)
> > > > - return ret;
> > >
> > > Has this now silently disappeared ?
> > >
> > > > -
> > > > - return uvc_v4l2_set_format(stream, fmt);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_s_fmt_vid_out(struct file *file, void *fh,
> > > > - struct v4l2_format *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > - int ret;
> > > > -
> > > > - ret = uvc_acquire_privileges(handle);
> > > > - if (ret < 0)
> > > > - return ret;
> > > > -
> > > > - return uvc_v4l2_set_format(stream, fmt);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_try_fmt_vid_cap(struct file *file, void *fh,
> > > > - struct v4l2_format *fmt)
> > > > -{
> > > > - struct uvc_fh *handle = fh;
> > > > - struct uvc_streaming *stream = handle->stream;
> > > > - struct uvc_streaming_control probe;
> > > > -
> > > > - return uvc_v4l2_try_format(stream, fmt, &probe, NULL, NULL);
> > > > -}
> > > > -
> > > > -static int uvc_ioctl_try_fmt_vid_out(struct file *file, void *fh,
> > > > - struct v4l2_format *fmt)
> > > > +static int uvc_ioctl_try_fmt(struct file *file, void *fh,
> > > > + struct v4l2_format *fmt)
> > > > {
> > > > struct uvc_fh *handle = fh;
> > > > struct uvc_streaming *stream = handle->stream;
> > > > @@ -1544,14 +1476,14 @@ static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
> > > >
> > > > const struct v4l2_ioctl_ops uvc_ioctl_ops = {
> > > > .vidioc_querycap = uvc_ioctl_querycap,
> > > > - .vidioc_enum_fmt_vid_cap = uvc_ioctl_enum_fmt_vid_cap,
> > > > - .vidioc_enum_fmt_vid_out = uvc_ioctl_enum_fmt_vid_out,
> > > > - .vidioc_g_fmt_vid_cap = uvc_ioctl_g_fmt_vid_cap,
> > > > - .vidioc_g_fmt_vid_out = uvc_ioctl_g_fmt_vid_out,
> > > > - .vidioc_s_fmt_vid_cap = uvc_ioctl_s_fmt_vid_cap,
> > > > - .vidioc_s_fmt_vid_out = uvc_ioctl_s_fmt_vid_out,
> > > > - .vidioc_try_fmt_vid_cap = uvc_ioctl_try_fmt_vid_cap,
> > > > - .vidioc_try_fmt_vid_out = uvc_ioctl_try_fmt_vid_out,
> > > > + .vidioc_enum_fmt_vid_cap = uvc_ioctl_enum_fmt,
> > > > + .vidioc_enum_fmt_vid_out = uvc_ioctl_enum_fmt,
> > > > + .vidioc_g_fmt_vid_cap = uvc_ioctl_g_fmt,
> > > > + .vidioc_g_fmt_vid_out = uvc_ioctl_g_fmt,
> > > > + .vidioc_s_fmt_vid_cap = uvc_ioctl_s_fmt,
> > > > + .vidioc_s_fmt_vid_out = uvc_ioctl_s_fmt,
> > > > + .vidioc_try_fmt_vid_cap = uvc_ioctl_try_fmt,
> > > > + .vidioc_try_fmt_vid_out = uvc_ioctl_try_fmt,
> >
> > Also, if you're removing wrapper, let's do the same for
> > uvc_ioctl_g_parm() and uvc_ioctl_s_parm(). Furthermore, please try to
> > preserve the order of the function definitions, sorting them as in the
> > ioctl_ops structure.
>
> Do you want the reorder in a different patch to ease the review or in the same?
The same is fine with me.
> > > > .vidioc_reqbufs = uvc_ioctl_reqbufs,
> > > > .vidioc_querybuf = uvc_ioctl_querybuf,
> > > > .vidioc_qbuf = uvc_ioctl_qbuf,
> > > >
> > > > ---
> > > > base-commit: 72ad4ff638047bbbdf3232178fea4bec1f429319
> > > > change-id: 20241127-uvc-dup-cap-out-6a03c01e30a3
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2024-11-28 20:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-27 7:31 Ricardo Ribalda
2024-11-28 20:24 ` Laurent Pinchart
2024-11-28 20:27 ` Ricardo Ribalda
2024-11-28 20:31 ` Laurent Pinchart
2024-11-28 20:36 ` Ricardo Ribalda
2024-11-28 20:46 ` Laurent Pinchart [this message]
2024-11-28 21:49 ` Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241128204619.GB25731@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=ribalda@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®