From nobody Tue Feb 10 12:14:19 2026 Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 264391DDC35 for ; Tue, 26 Nov 2024 16:20:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732638037; cv=none; b=VqOgcBjnRxOs4waFQbZYzyYAYqp1XjNUho1/006remxmhIBlkJR4IeK2Fwwb2vYEwkYy8oEMASxN3CfdRBuKCiZDLF4Ln5vF1l09SWRrIWhvS4JpM81tC5gXdItE7QOT/pcqk1bxyEXbFwFCI71raKPzzgzSLsnFFX06l9O487Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732638037; c=relaxed/simple; bh=x5kYRVcSK4regsPtlTEktgdS6fXUdjiyw9Jv/VfqSKI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Nv24oF9fNfSBRl6/W+aq2ueoXYTuND4X3p2B8BwKL/QueWwDg3srj0DdJV9f4LbBKq/qwAGu7UBIG6I1XFWXtlWMDVHxoL0239tpnmninapYuhY87rHGY7ZFFb7hpLK+WaGOP93UaaWP6qCsREQADbS9Er5mA56ffgxzwC8pp18= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=BhwTGNUp; arc=none smtp.client-ip=209.85.210.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="BhwTGNUp" Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-71d40003870so774886a34.0 for ; Tue, 26 Nov 2024 08:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732638033; x=1733242833; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=yxOLHw2VBQB5L41d2F/BZfaylw/KjmpdZ2BT3uiOSdE=; b=BhwTGNUporFl25ZPpR1NvU06BawTuoW47fC+3eZQpOZVhREAMB029UbplE7PMG0lTB Gbu0rWMp6oZyb15A3wnbi+hYJqtF1SXdOm4at+dXs3Vsxaj/yGgU+52W9V0XdRQTPJfM YGLYZDdy2O5GdW7O9mJlwGvu3nCZO5dEQ60VY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732638033; x=1733242833; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yxOLHw2VBQB5L41d2F/BZfaylw/KjmpdZ2BT3uiOSdE=; b=oZ7bTHW6MzrJkaGuWm+tSxONWBFbg153zhY3UOsqzWGqUa1G7YT7YXB3ymmX7H32YA r5Y3L+eIlh+zThGTJMHSRg8viSjwf+NwHX73I+8ck/Qc5lMf6vqzk5Ho5b0E0o/0yvNN K0LyBkGaJzWXnOziCQKEUMl9a3kZoSyTWhFOL4DeXXTOdw0mBysvt5XMmpUahGx2Wtqj sLqtIVkIIodLIyVfNPcYIdq47/FTcNPi3d10bv1D2XXxNVY4v6Pq0zQQw/kFwdSXkKRD uKKYUHxtSwclyCb8fKA2uneMZk1alBTXgAu1qHILqXugFIbutfhJ8k9/b+DWu2EGBcWW jIDg== X-Forwarded-Encrypted: i=1; AJvYcCUanj1kibeMQKmrXcQ4OkiDVQIrXJKXr1/g/zD9iP9OVb/D1pwDK97uX6bihQbveN30b3SkYj+jjNZ5kbA=@vger.kernel.org X-Gm-Message-State: AOJu0YzYyJVjBLWvG7JhqdC5gPI5P+YpgUiSIslS3LPI/CfhmK6HutoR jQVTy/x2ClATOawRbsXYlLAm8djTqUyOfQI3nxXjt6qQkSkadYZOVGIb6rSUmA== X-Gm-Gg: ASbGnctxY2t8+NmJT1q2r5TWhTlW67OYaR4f44x9jb7DFeGy0b8lAiTCs7i61ZasuRi nddG0+hAtS45x1Ds+ewXIp+1cPgaDhHrhES87IFlgi/T2VOuI+au083NUrAXL0K55QLkG7diCzT tyfkn38tTVh0g2vgeOJUSdgiPMfrOqekzqUGFkmvpuzTK0eIBit8OyUTIDx2mfO5eact7ss3kjX txamTJcFZreUqkhTxRibLgqZoynuvZDvbNl4TB7XLYsIsVAh6xrzilaVUhlnjdrAaXy+Dbv4fNb e2jN2TEmEBkIQcgVE74cNYqs X-Google-Smtp-Source: AGHT+IH9UXCX+Ay1aMbd9HmFc/mZX4tEK6BZIIou4isklRZcLG+NWhVRDKABiscK2ZTOUwj4/Pc5Ow== X-Received: by 2002:a05:6358:52c7:b0:1ca:adf1:2e98 with SMTP id e5c5f4694b2df-1caadf1307bmr111624355d.1.1732638033244; Tue, 26 Nov 2024 08:20:33 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id a1e0cc1a2514c-85b4e8205fdsm346532241.1.2024.11.26.08.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Nov 2024 08:20:32 -0800 (PST) From: Ricardo Ribalda Date: Tue, 26 Nov 2024 16:18:59 +0000 Subject: [PATCH 9/9] media: uvcvideo: Remove duplicated cap/out code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241126-uvc-granpower-ng-v1-9-6312bf26549c@chromium.org> References: <20241126-uvc-granpower-ng-v1-0-6312bf26549c@chromium.org> In-Reply-To: <20241126-uvc-granpower-ng-v1-0-6312bf26549c@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Ricardo Ribalda X-Mailer: b4 0.13.0 The *_vid_cap and *_vid_out helpers seem to be identical. Remove all the duplicated code. Signed-off-by: Ricardo Ribalda --- 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_v= 4l2.c index 0a058798d075..cc32ce3275da 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 *s= tream, return ret; } =20 -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 =3D fh; + struct uvc_streaming *stream =3D handle->stream; const struct uvc_format *format; const struct uvc_frame *frame; int ret =3D 0; @@ -395,9 +397,11 @@ static int uvc_v4l2_get_format(struct uvc_streaming *s= tream, return ret; } =20 -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 =3D fh; + struct uvc_streaming *stream =3D handle->stream; struct uvc_streaming_control probe; const struct uvc_format *format; const struct uvc_frame *frame; @@ -673,11 +677,13 @@ static int uvc_ioctl_querycap(struct file *file, void= *fh, return 0; } =20 -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 =3D fh; + struct uvc_streaming *stream =3D handle->stream; enum v4l2_buf_type type =3D fmt->type; + const struct uvc_format *format; u32 index =3D fmt->index; =20 if (fmt->type !=3D stream->type || fmt->index >=3D stream->nformats) @@ -695,82 +701,8 @@ static int uvc_ioctl_enum_fmt(struct uvc_streaming *st= ream, return 0; } =20 -static int uvc_ioctl_enum_fmt_vid_cap(struct file *file, void *fh, - struct v4l2_fmtdesc *fmt) -{ - struct uvc_fh *handle =3D fh; - struct uvc_streaming *stream =3D 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 =3D fh; - struct uvc_streaming *stream =3D 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 =3D fh; - struct uvc_streaming *stream =3D 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 =3D fh; - struct uvc_streaming *stream =3D 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 =3D fh; - struct uvc_streaming *stream =3D handle->stream; - int ret; - - ret =3D uvc_acquire_privileges(handle); - if (ret < 0) - return ret; - - 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 =3D fh; - struct uvc_streaming *stream =3D handle->stream; - int ret; - - ret =3D 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 =3D fh; - struct uvc_streaming *stream =3D 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 =3D fh; struct uvc_streaming *stream =3D handle->stream; @@ -1576,14 +1508,14 @@ static unsigned long uvc_v4l2_get_unmapped_area(str= uct file *file, =20 const struct v4l2_ioctl_ops uvc_ioctl_ops =3D { .vidioc_querycap =3D uvc_ioctl_querycap, - .vidioc_enum_fmt_vid_cap =3D uvc_ioctl_enum_fmt_vid_cap, - .vidioc_enum_fmt_vid_out =3D uvc_ioctl_enum_fmt_vid_out, - .vidioc_g_fmt_vid_cap =3D uvc_ioctl_g_fmt_vid_cap, - .vidioc_g_fmt_vid_out =3D uvc_ioctl_g_fmt_vid_out, - .vidioc_s_fmt_vid_cap =3D uvc_ioctl_s_fmt_vid_cap, - .vidioc_s_fmt_vid_out =3D uvc_ioctl_s_fmt_vid_out, - .vidioc_try_fmt_vid_cap =3D uvc_ioctl_try_fmt_vid_cap, - .vidioc_try_fmt_vid_out =3D uvc_ioctl_try_fmt_vid_out, + .vidioc_enum_fmt_vid_cap =3D uvc_ioctl_enum_fmt, + .vidioc_enum_fmt_vid_out =3D uvc_ioctl_enum_fmt, + .vidioc_g_fmt_vid_cap =3D uvc_ioctl_g_fmt, + .vidioc_g_fmt_vid_out =3D uvc_ioctl_g_fmt, + .vidioc_s_fmt_vid_cap =3D uvc_ioctl_s_fmt, + .vidioc_s_fmt_vid_out =3D uvc_ioctl_s_fmt, + .vidioc_try_fmt_vid_cap =3D uvc_ioctl_try_fmt, + .vidioc_try_fmt_vid_out =3D uvc_ioctl_try_fmt, .vidioc_reqbufs =3D uvc_ioctl_reqbufs, .vidioc_querybuf =3D uvc_ioctl_querybuf, .vidioc_qbuf =3D uvc_ioctl_qbuf, --=20 2.47.0.338.g60cca15819-goog