linux-staging.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
From: Ricardo Ribalda <ribalda@chromium.org>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
	 Mike Isely <isely@pobox.com>,
	 Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	 Hans de Goede <hdegoede@redhat.com>,
	 Sakari Ailus <sakari.ailus@linux.intel.com>,
	 Andy Shevchenko <andy@kernel.org>,
	 Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	 Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	 linux-staging@lists.linux.dev,
	Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH 04/10] media: uvcvideo: Remove vidioc_queryctrl
Date: Mon, 09 Dec 2024 19:25:35 +0000	[thread overview]
Message-ID: <20241209-queryctrl-v1-4-deff7acfcdcb@chromium.org> (raw)
In-Reply-To: <20241209-queryctrl-v1-0-deff7acfcdcb@chromium.org>

It can be implemented by the v4l2 ioctl framework using
vidioc_query_ext_ctrl.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/usb/uvc/uvc_v4l2.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 97c5407f6603..39f0ddb6d01c 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1014,15 +1014,6 @@ static int uvc_ioctl_s_input(struct file *file, void *fh, unsigned int input)
 	return ret;
 }
 
-static int uvc_ioctl_queryctrl(struct file *file, void *fh,
-			       struct v4l2_queryctrl *qc)
-{
-	struct uvc_fh *handle = fh;
-	struct uvc_video_chain *chain = handle->chain;
-
-	return uvc_query_v4l2_ctrl(chain, qc);
-}
-
 static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh,
 				    struct v4l2_query_ext_ctrl *qec)
 {
@@ -1563,7 +1554,6 @@ const struct v4l2_ioctl_ops uvc_ioctl_ops = {
 	.vidioc_enum_input = uvc_ioctl_enum_input,
 	.vidioc_g_input = uvc_ioctl_g_input,
 	.vidioc_s_input = uvc_ioctl_s_input,
-	.vidioc_queryctrl = uvc_ioctl_queryctrl,
 	.vidioc_query_ext_ctrl = uvc_ioctl_query_ext_ctrl,
 	.vidioc_g_ext_ctrls = uvc_ioctl_g_ext_ctrls,
 	.vidioc_s_ext_ctrls = uvc_ioctl_s_ext_ctrls,

-- 
2.47.0.338.g60cca15819-goog


  parent reply	other threads:[~2024-12-09 19:25 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-09 19:25 [PATCH 00/10] media: Remove vidioc_g/s_ctrl and vidioc_queryctrl callbacks Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 01/10] media: ioctl: Simulate v4l2_queryctrl with v4l2_query_ext_ctrl Ricardo Ribalda
2024-12-09 19:34   ` Hans Verkuil
2024-12-09 20:02     ` Ricardo Ribalda
2024-12-09 21:26       ` Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 02/10] media: pvrusb2: Convert queryctrl to query_ext_ctrl Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 03/10] media: pvrusb2: Remove g/s_ctrl callbacks Ricardo Ribalda
2024-12-09 19:25 ` Ricardo Ribalda [this message]
2024-12-09 19:25 ` [PATCH 05/10] media: atomisp: Replace queryctrl with query_ext_ctrl Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 06/10] media: atomisp: Remove vidioc_g/s callback Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 07/10] media: v4l2: Remove vidioc_queryctrl callback Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 08/10] media: v4l2: Remove vidioc_g_ctrl callback Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 09/10] media: cx231xx: Replace s_ctrl with s_ext_ctrls Ricardo Ribalda
2024-12-09 19:25 ` [PATCH 10/10] media: v4l2: Remove vidioc_s_ctrl callback 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=20241209-queryctrl-v1-4-deff7acfcdcb@chromium.org \
    --to=ribalda@chromium.org \
    --cc=andy@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=hverkuil@xs4all.nl \
    --cc=isely@pobox.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=mchehab@kernel.org \
    --cc=sakari.ailus@linux.intel.com \
    /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;
as well as URLs for NNTP newsgroup(s).