From nobody Mon Oct 6 03:13:59 2025 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 5AAC62EB5DC for ; Fri, 25 Jul 2025 13:12:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753449175; cv=none; b=efHF2vlsV89+YIPR9duhowOfnf6oiITml34P4Ad8KyrkI6FhZLr+wDz9crm28G/reQTcc9NSNN0u76UlJCX0UYv7kJID8FXbg2LIlcermwd9azTMAzmtB3TSQY/3u0lhBOGtwEtQmCw8fOWM0qCqkmNaEEtjaktOSfEy3z0aeuU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753449175; c=relaxed/simple; bh=B+hipYnmnKVQBVxDpHzSUj0j8nDqCDlRm1GoUy4uCGM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QNfqXlfq/nmLkSVjrOhmaOuCcTNkuh8Huq8dbzJZBWgawWBHdNfFJoJxiahGucvfnuvNdtooRRnjNcSoncpe44NyJQyuEyGVFy4wPb+WVsjkpV4w+mgnzDN4wLASpIxSXTtD6DDKxWxhOP3TaD2ICXZcr/v8z2JixbXap2H/lIs= 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=A8mu3jBa; arc=none smtp.client-ip=209.85.167.45 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="A8mu3jBa" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-5550dca1241so1905773e87.0 for ; Fri, 25 Jul 2025 06:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1753449170; x=1754053970; 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=ucF/oLOA4TbqpydmTqdjEQZnajk7+aaLS8yv4iP8hbc=; b=A8mu3jBaDUv1IPKuQgNESAdD3hNbQAXaTC/352WpL6h+1rAPbNvIQbPGnUTm5P0Rp6 uyTTL+Xc1LveZkIdMMS8YTRO6FOwpbnj1vDQwyrMnsO48FxLVRv9+LwFAc3wNzGmPAht 9Jzu73zIDSdg1HNi8CnXNzDAIg6zcDTY5im0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753449170; x=1754053970; 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=ucF/oLOA4TbqpydmTqdjEQZnajk7+aaLS8yv4iP8hbc=; b=pSMSWxectG3l11IgWQ5ovyd8Ku8DncLcfmH/Xb3foWey92DnqHEagm9x9A/Dmb4YHU ty2PmWBHctz18X/Q1XpH9T3l2PREv/g/umtaNoU1d5tdWcSdqo2IPSZ88vX44Miinmwo 8hZDc9yL3zinvPTxmzJs+2Ze/LsIUReRGxTIet0rwE1ICK0KjFsK412jo0KkFu0zJblx 9y57ZQKBtDUeE4G8vwr3QkrWw4SLilsiQyt3245carkphkS5rdpOMQ7NSymY5S7fIrEn W8qhc6lAML6pY05BjNFeQq7NvMotUNivNjsV6PPmimwghoiQrADRD3Hw9T/FljLDav21 yffg== X-Forwarded-Encrypted: i=1; AJvYcCW6Rt+BRt5Gch4PNHll9Yd/jhk9p9yo37ILGEyTiBxcRAP8fhNXlyhxDCdTNN7+k2jTNsWmsXS/rlJB7lE=@vger.kernel.org X-Gm-Message-State: AOJu0YxJ8tvgtGDXzJjOF7fY8EcBcWZbgUPh16yTBxSYIVPuQW+1pFwu bgQziH0R+iqCbtYcW2L0/DRiQp5cH4EgmaFIloupVi43x1l2iNtotklSQY2A8/vMoA== X-Gm-Gg: ASbGnctO7gytbutQVWwmCu+jGavMc/+hF8BiipA6Y4gcNXMOlqKTkPrnWbumXoP6fu/ 5sfumi1pWEb+Hgwuiu4fMrKGSKE7SbDlRODc1RE7o7bjFF/GZxME0Jpgj4X+Apuw6W1iDio0XEJ WOepsWltmc4FintZpFOPub/+efm9P7ZUWHvg3eAuNIFs1JQ7Fo4X9fTDAcTDGXKEuvzYXe79UNz 2ALzwU2Rtx7164d3FBnmnOu7BftYY72ef8VzrdA29PnvJ/c6ERe49Ry9ZTsdMoYENX0S0Kw6bEB TgN/z74jF5pvkqZJmP/rO2fhP+jzlt/mHlLiQSKiXNDWaL63VbBLxmErD+04AUqm/CZrk+Jm1bE uiLNfA7jQxGN8MtxbE/cFXbXTlITWc1QWLeut8KLZQ41DN8xFZw+HOv1SBZR1GoUd9zI1s6DFjT l42Q== X-Google-Smtp-Source: AGHT+IGAJSFi+klKs5Qg3NJdNJj8fasBOknOi2sEOpQUzaojuEKAaiJjGDxRSVN36h4PsAqmyofISA== X-Received: by 2002:a05:6512:23a2:b0:55a:4e0b:54bb with SMTP id 2adb3069b0e04-55b5f45b638mr574961e87.16.1753449170368; Fri, 25 Jul 2025 06:12:50 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55b53c712d3sm934605e87.118.2025.07.25.06.12.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 06:12:49 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 25 Jul 2025 13:12:48 +0000 Subject: [PATCH v2 1/2] media: uvcvideo: Drop stream->mutex 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: <20250725-uvc-onelocksless-v2-1-953477834929@chromium.org> References: <20250725-uvc-onelocksless-v2-0-953477834929@chromium.org> In-Reply-To: <20250725-uvc-onelocksless-v2-0-953477834929@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Since commit c93d73c9c2cf ("media: uvcvideo: Use vb2 ioctl and fop helpers"), the IOCTLs are serialized. Due to this there is no more need to protect ctrl, cur_format or cur_frame from concurrent access. Drop stream->mutex after thanking it for years of good service. Use this opportunity to do fix some CodeStyle. Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_driver.c | 4 ---- drivers/media/usb/uvc/uvc_metadata.c | 10 +++------ drivers/media/usb/uvc/uvc_v4l2.c | 41 +++++++-------------------------= ---- drivers/media/usb/uvc/uvcvideo.h | 6 ------ 4 files changed, 11 insertions(+), 50 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 775bede0d93d9b3e5391914aa395326d3de6a3b1..3039e6a533b82dd917050d416c9= ced8756d69170 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -183,8 +183,6 @@ static void uvc_stream_delete(struct uvc_streaming *str= eam) if (stream->async_wq) destroy_workqueue(stream->async_wq); =20 - mutex_destroy(&stream->mutex); - usb_put_intf(stream->intf); =20 kfree(stream->formats); @@ -201,8 +199,6 @@ static struct uvc_streaming *uvc_stream_new(struct uvc_= device *dev, if (stream =3D=3D NULL) return NULL; =20 - mutex_init(&stream->mutex); - stream->dev =3D dev; stream->intf =3D usb_get_intf(intf); stream->intfnum =3D intf->cur_altsetting->desc.bInterfaceNumber; diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index 229e08ff323eed9129d835b24ea2e8085bb713b8..649844e2ad60ed9e9951daec871= f2000f48702a6 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -100,16 +100,12 @@ static int uvc_meta_v4l2_set_format(struct file *file= , void *fh, * Metadata buffers would still be perfectly parseable, but it's more * consistent and cleaner to disallow that. */ - mutex_lock(&stream->mutex); - if (vb2_is_busy(&stream->meta.queue.queue)) - ret =3D -EBUSY; - else - stream->meta.format =3D fmt->dataformat; + return -EBUSY; =20 - mutex_unlock(&stream->mutex); + stream->meta.format =3D fmt->dataformat; =20 - return ret; + return 0; } =20 static int uvc_meta_v4l2_enum_formats(struct file *file, void *fh, diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index 160f9cf6e6dbdbf39e3eff56a5d5ea1d977fbe22..fdc4520a7bb42af7cd5cb9c1fa4= 9957c31e0041c 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -329,14 +329,12 @@ static int uvc_v4l2_try_format(struct uvc_streaming *= stream, * developers test their webcams with the Linux driver as well as with * the Windows driver). */ - mutex_lock(&stream->mutex); if (stream->dev->quirks & UVC_QUIRK_PROBE_EXTRAFIELDS) probe->dwMaxVideoFrameSize =3D stream->ctrl.dwMaxVideoFrameSize; =20 /* Probe the device. */ ret =3D uvc_probe_video(stream, probe); - mutex_unlock(&stream->mutex); if (ret < 0) return ret; =20 @@ -395,19 +393,15 @@ static int uvc_ioctl_g_fmt(struct file *file, void *f= h, struct uvc_streaming *stream =3D handle->stream; const struct uvc_format *format; const struct uvc_frame *frame; - int ret =3D 0; =20 if (fmt->type !=3D stream->type) return -EINVAL; =20 - mutex_lock(&stream->mutex); format =3D stream->cur_format; frame =3D stream->cur_frame; =20 - if (format =3D=3D NULL || frame =3D=3D NULL) { - ret =3D -EINVAL; - goto done; - } + if (!format || !frame) + return -EINVAL; =20 fmt->fmt.pix.pixelformat =3D format->fcc; fmt->fmt.pix.width =3D frame->wWidth; @@ -419,9 +413,7 @@ static int uvc_ioctl_g_fmt(struct file *file, void *fh, fmt->fmt.pix.xfer_func =3D format->xfer_func; fmt->fmt.pix.ycbcr_enc =3D format->ycbcr_enc; =20 -done: - mutex_unlock(&stream->mutex); - return ret; + return 0; } =20 static int uvc_ioctl_s_fmt(struct file *file, void *fh, @@ -441,19 +433,14 @@ static int uvc_ioctl_s_fmt(struct file *file, void *f= h, if (ret < 0) return ret; =20 - mutex_lock(&stream->mutex); - if (vb2_is_busy(&stream->queue.queue)) { - ret =3D -EBUSY; - goto done; - } + if (vb2_is_busy(&stream->queue.queue)) + return -EBUSY; =20 stream->ctrl =3D probe; stream->cur_format =3D format; stream->cur_frame =3D frame; =20 -done: - mutex_unlock(&stream->mutex); - return ret; + return 0; } =20 static int uvc_ioctl_g_parm(struct file *file, void *fh, @@ -466,10 +453,7 @@ static int uvc_ioctl_g_parm(struct file *file, void *f= h, if (parm->type !=3D stream->type) return -EINVAL; =20 - mutex_lock(&stream->mutex); numerator =3D stream->ctrl.dwFrameInterval; - mutex_unlock(&stream->mutex); - denominator =3D 10000000; v4l2_simplify_fraction(&numerator, &denominator, 8, 333); =20 @@ -519,12 +503,8 @@ static int uvc_ioctl_s_parm(struct file *file, void *f= h, uvc_dbg(stream->dev, FORMAT, "Setting frame interval to %u/%u (%u)\n", timeperframe.numerator, timeperframe.denominator, interval); =20 - mutex_lock(&stream->mutex); - - if (uvc_queue_streaming(&stream->queue)) { - mutex_unlock(&stream->mutex); + if (uvc_queue_streaming(&stream->queue)) return -EBUSY; - } =20 format =3D stream->cur_format; frame =3D stream->cur_frame; @@ -556,14 +536,11 @@ static int uvc_ioctl_s_parm(struct file *file, void *= fh, =20 /* Probe the device with the new settings. */ ret =3D uvc_probe_video(stream, &probe); - if (ret < 0) { - mutex_unlock(&stream->mutex); + if (ret < 0) return ret; - } =20 stream->ctrl =3D probe; stream->cur_frame =3D frame; - mutex_unlock(&stream->mutex); =20 /* Return the actual frame period. */ timeperframe.numerator =3D probe.dwFrameInterval; @@ -941,10 +918,8 @@ static int uvc_ioctl_g_selection(struct file *file, vo= id *fh, =20 sel->r.left =3D 0; sel->r.top =3D 0; - mutex_lock(&stream->mutex); sel->r.width =3D stream->cur_frame->wWidth; sel->r.height =3D stream->cur_frame->wHeight; - mutex_unlock(&stream->mutex); =20 return 0; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 757254fc4fe930ae61c9d0425f04d4cd074a617e..86765b9d7935f0888476249c3fb= 826cd7f36b35c 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -469,12 +469,6 @@ struct uvc_streaming { const struct uvc_format *cur_format; const struct uvc_frame *cur_frame; =20 - /* - * Protect access to ctrl, cur_format, cur_frame and hardware video - * probe control. - */ - struct mutex mutex; - /* Buffers queue. */ unsigned int frozen : 1; struct uvc_video_queue queue; --=20 2.50.1.470.g6ba607880d-goog From nobody Mon Oct 6 03:13:59 2025 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 509EA2ED848 for ; Fri, 25 Jul 2025 13:12:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753449176; cv=none; b=D6wVD7vUuE4OafCHTWA4luT2X4YySx9IwUodyz7MITubq+DanvY+LjVsjoarHA42Lbyoatxs18YgI2E+Q6fskdophwTjcl1kPYn8JjbTcpZ2OHclnSkNFSC6QDid4JGrILmLbruD3qNekthO4iLCGqBujL7w7/E81o0RhQetm+c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753449176; c=relaxed/simple; bh=qJ7bTd4Sn1KKVCh65oLiiB9cj7egg8oR8PkjOwHMbZo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qoyVXCstAF8Tmd3HxRAkB/HT5XQ7SDdHR/tJ1Vel2M0GomKQbGbYd/3fFdu4LyByo0kyscvChaDZsjGYN51kW9H0ZZuH0v0G1/jdxCBJJVGzx6I2kATdlJkBhGRY5MyulnmI+1NJXDum987irEfyJfOzW3D1Xt5IOIafi+YVEWk= 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=QEJltUpO; arc=none smtp.client-ip=209.85.167.53 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="QEJltUpO" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5561d41fc96so2490998e87.1 for ; Fri, 25 Jul 2025 06:12:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1753449171; x=1754053971; 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=UFK1sBIyvrwVP0jUx5SHcUQRAyLYbMkJjN/1zNnddx8=; b=QEJltUpO3iH+uNkPuzwRoQB8OIZF6+vX1ULlfNLGaylWe6lriki/lQfYAY93FFxFiM 2jiNHI8/DZmpEgK4rwhB7vvbOf9hGbb7fkVDjY+/UynNjeczeFa/fbN/3+UFKBpRXVbp HmybNAXzhsvhp3wbUl1D7UL0i/rcS1u8/kkmk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753449171; x=1754053971; 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=UFK1sBIyvrwVP0jUx5SHcUQRAyLYbMkJjN/1zNnddx8=; b=ki3RDtj2XnABevhKvGRe9MMSsPJv3KWvR/jIjNsFgdEH/vOn2UTYO246jUFToqhdLj OmdpVPnIbnRodtA5jpnQQDSO03u6taOAIjJmNy+zLpRVHXq1ezoIli5kjJgvrjD7wLlf U1CSBTeAvG+ednCrCp/ULjVejvzWA9vPKb+0eNegTJztIgYQm906RJXgxTUapmvoz257 rj6KvthXNQ9lWt589WEQTN+hIPz55jc4krqFddV61ouEXwaoeCoK4uDtWRoinvrDfFzW i+S2D8KRyDBjIiHFMON1RpcT7iOZbUkAYIdWTidzLsJp9HW8xQtZfz1S62PMIgUqdEd7 47aw== X-Forwarded-Encrypted: i=1; AJvYcCWlR/KmPnz+xnq5Q4ZF4E6NP0tI2gUCD/nnqk+c/yckx41evV4kVG/oV0k9ws/KyGQZ10diQ0T7l0rBQ3s=@vger.kernel.org X-Gm-Message-State: AOJu0Yzc+j+0ErMPI80A6MODqomo58GGM0RaRwxv+Hbhk2VFEk0Mg1pE JOqBMrB5NMJTWyUsatjGLXEf8WnVvB18xcT4Ay+sVcvXH1D5ch4bjgIXxGAYf0o0p6Rd+uNkjxf WuVk= X-Gm-Gg: ASbGnctb2yDTGf1c0Qam5NaB+dTIKzPS0oIoI++qcU+TMM+Uc+Om/3wj478KstK1YLD 5/Rm8InQVUXOSpDMhKWXn5jTuX46/31j6FqMgyDznY/Gl/+o388nGKgDFUKK+z4aBC3yRJ6dj4n wRMRsr5lIKMp0fkitvaAS5s/TjMqK4ToEU0QykqBGSfjdTHDCKzkwrdXI1B++qQn8tSq6dR0i/3 3XDTD+FpyDdy7LWkaMijlpEmv5HR3Jm6gpmoHAllsab2HgDWv8RN/J4dm+6+aOi5QcMaeLOAbSi e+VJvHaRxC2bflXcuOjlNrRxg7eXYbZTsKzEM5Oyz2GIpE9ZujxHdUnxHYtpetKm/9rYDOdOys3 ykScULRgA3/TeYjjBSPwkvc6CjQ+Ejm1TM4+hImDSJ2YVFxbvaMUdRYF/6Pm1R0Mkzg+k5mot3P NZdQ== X-Google-Smtp-Source: AGHT+IGuPgZqwk5F4hIkGfnvSbeismezpiFGW9+SDTWkYGxgugFIBA+kmGWaNfQEX9F1MNWxbkbiGg== X-Received: by 2002:a05:6512:234c:b0:558:f96d:f74b with SMTP id 2adb3069b0e04-55b5f48979bmr576795e87.38.1753449171235; Fri, 25 Jul 2025 06:12:51 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55b53c712d3sm934605e87.118.2025.07.25.06.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jul 2025 06:12:50 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 25 Jul 2025 13:12:49 +0000 Subject: [PATCH v2 2/2] media: uvcvideo: Move video_device under video_queue 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: <20250725-uvc-onelocksless-v2-2-953477834929@chromium.org> References: <20250725-uvc-onelocksless-v2-0-953477834929@chromium.org> In-Reply-To: <20250725-uvc-onelocksless-v2-0-953477834929@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 It is more natural that the "struct video_device" belongs to uvc_video_queue instead of uvc_streaming. This is an aesthetic change. No functional change expected. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda Reviewed-by: Laurent Pinchart --- drivers/media/usb/uvc/uvc_driver.c | 16 ++++++++-------- drivers/media/usb/uvc/uvc_metadata.c | 3 +-- drivers/media/usb/uvc/uvc_v4l2.c | 2 +- drivers/media/usb/uvc/uvc_video.c | 2 +- drivers/media/usb/uvc/uvcvideo.h | 4 +--- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 3039e6a533b82dd917050d416c9ced8756d69170..505e85a6b4d99666f3a4a9441dd= 1ca72e13228e0 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1954,11 +1954,11 @@ static void uvc_unregister_video(struct uvc_device = *dev) =20 list_for_each_entry(stream, &dev->streams, list) { /* Nothing to do here, continue. */ - if (!video_is_registered(&stream->vdev)) + if (!video_is_registered(&stream->queue.vdev)) continue; =20 - vb2_video_unregister_device(&stream->vdev); - vb2_video_unregister_device(&stream->meta.vdev); + vb2_video_unregister_device(&stream->queue.vdev); + vb2_video_unregister_device(&stream->meta.queue.vdev); =20 /* * Now both vdevs are not streaming and all the ioctls will @@ -1980,12 +1980,12 @@ static void uvc_unregister_video(struct uvc_device = *dev) =20 int uvc_register_video_device(struct uvc_device *dev, struct uvc_streaming *stream, - struct video_device *vdev, struct uvc_video_queue *queue, enum v4l2_buf_type type, const struct v4l2_file_operations *fops, const struct v4l2_ioctl_ops *ioctl_ops) { + struct video_device *vdev =3D &queue->vdev; int ret; =20 /* Initialize the video buffers queue. */ @@ -2067,9 +2067,9 @@ static int uvc_register_video(struct uvc_device *dev, uvc_debugfs_init_stream(stream); =20 /* Register the device with V4L. */ - return uvc_register_video_device(dev, stream, &stream->vdev, - &stream->queue, stream->type, - &uvc_fops, &uvc_ioctl_ops); + return uvc_register_video_device(dev, stream, &stream->queue, + stream->type, &uvc_fops, + &uvc_ioctl_ops); } =20 /* @@ -2105,7 +2105,7 @@ static int uvc_register_terms(struct uvc_device *dev, */ uvc_meta_register(stream); =20 - term->vdev =3D &stream->vdev; + term->vdev =3D &stream->queue.vdev; } =20 return 0; diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index 649844e2ad60ed9e9951daec871f2000f48702a6..9ed50c3249cbd222be71ffdba18= c41ff972158af 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -228,12 +228,11 @@ static int uvc_meta_detect_msxu(struct uvc_device *de= v) int uvc_meta_register(struct uvc_streaming *stream) { struct uvc_device *dev =3D stream->dev; - struct video_device *vdev =3D &stream->meta.vdev; struct uvc_video_queue *queue =3D &stream->meta.queue; =20 stream->meta.format =3D V4L2_META_FMT_UVC; =20 - return uvc_register_video_device(dev, stream, vdev, queue, + return uvc_register_video_device(dev, stream, queue, V4L2_BUF_TYPE_META_CAPTURE, &uvc_meta_fops, &uvc_meta_ioctl_ops); } diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v= 4l2.c index fdc4520a7bb42af7cd5cb9c1fa49957c31e0041c..5b0a7edc9966e7c66438af6daa1= f98fa87a6d0d3 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -576,7 +576,7 @@ static int uvc_v4l2_open(struct file *file) if (!handle) return -ENOMEM; =20 - v4l2_fh_init(&handle->vfh, &stream->vdev); + v4l2_fh_init(&handle->vfh, &stream->queue.vdev); v4l2_fh_add(&handle->vfh); handle->chain =3D stream->chain; handle->stream =3D stream; diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index 2e377e7b9e81599aca19b800a171cc16a09c1e8a..ef12a935829277d7f1c1ebffcd9= 01742513fbe7e 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1705,7 +1705,7 @@ static void uvc_video_complete(struct urb *urb) struct uvc_streaming *stream =3D uvc_urb->stream; struct uvc_video_queue *queue =3D &stream->queue; struct uvc_video_queue *qmeta =3D &stream->meta.queue; - struct vb2_queue *vb2_qmeta =3D stream->meta.vdev.queue; + struct vb2_queue *vb2_qmeta =3D stream->meta.queue.vdev.queue; struct uvc_buffer *buf =3D NULL; struct uvc_buffer *buf_meta =3D NULL; unsigned long flags; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 86765b9d7935f0888476249c3fb826cd7f36b35c..d4947878fd0126d788d16977a55= 3fa0f45645dcd 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -328,6 +328,7 @@ struct uvc_buffer { #define UVC_QUEUE_DISCONNECTED (1 << 0) =20 struct uvc_video_queue { + struct video_device vdev; struct vb2_queue queue; struct mutex mutex; /* * Serializes vb2_queue and @@ -450,7 +451,6 @@ struct uvc_urb { struct uvc_streaming { struct list_head list; struct uvc_device *dev; - struct video_device vdev; struct uvc_video_chain *chain; atomic_t active; =20 @@ -477,7 +477,6 @@ struct uvc_streaming { struct uvc_buffer *meta_buf); =20 struct { - struct video_device vdev; struct uvc_video_queue queue; u32 format; } meta; @@ -727,7 +726,6 @@ int uvc_meta_register(struct uvc_streaming *stream); =20 int uvc_register_video_device(struct uvc_device *dev, struct uvc_streaming *stream, - struct video_device *vdev, struct uvc_video_queue *queue, enum v4l2_buf_type type, const struct v4l2_file_operations *fops, --=20 2.50.1.470.g6ba607880d-goog