From patchwork Fri Oct 27 20:19:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avichal Rakesh X-Patchwork-Id: 159148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp862372vqb; Fri, 27 Oct 2023 13:20:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFrukz/5kaiR+PpPe7eP1lXVRnL3DBUKmvKExfdCyFWxkGgZ2il92Yt4F1JgCCObCAGJDR5 X-Received: by 2002:a25:d047:0:b0:da0:3b6c:fc22 with SMTP id h68-20020a25d047000000b00da03b6cfc22mr3715792ybg.31.1698438054566; Fri, 27 Oct 2023 13:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698438054; cv=none; d=google.com; s=arc-20160816; b=B5+714hVpF/bx+GtRNi/ZSy4xgBNVhrhyoPR5r1hb+XZLaUtq0Nqsi2r6Sa6tQ5lim YGfE77tILPRg3vXH2zGZmCrHttAp7Kg6OzLdhk4b/bKwHfTrfxOCh8A06og9By/3TLw7 AMeqm45PsyTE+pa5HNurapG1kWUJ8jb0I6znTmz3kvO2+UtHULi+jiL7zg4VMQyB5/fq IAZPnzuV39nHMy4Oyoqr4eLa/cIld3n+pTFqed833fPp1BwVhnZfHOZ2ygPHA7okPp4L UHTeXm3Rp1Sk4PbZ1Bp4ZMPq5Zx70HVFdEjw8IAdFB/z+pmRt/5eLnTeicub2s73+UlZ aelg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=hpZGNvK+8AimoR1c5B/6cfe/M0yZF2viXEDURopJcAk=; fh=p+LYTnSpNzrqEe7IwOmRmqfbsNd6xnlNPhpiE7PelQI=; b=cjaIs02a0ggG46Fb+sMAzIGq8a/xcEkJfyQirditaKZT8pV0DSRUelAWfGeOd0xFs5 mcnBj3cBO27/XCQRQgXbpwJKtHUAQx9mUbHbE8dUawxc07XoZuuJ72WBKGI/CnmtEsiu ZpGbAFPsrk/heJygSIZqv30sTvUt9oBe2ctVVwXgfBNC++SH6Ywgisl9B1xQXZQrbo6C sft8thjb+SM/W1p31ecwc+ylJYlAa78dc6yHoPdhfVrMkDuc4Mt58MLt5mfirIG9iDk2 OOOFNrUyu5lqXu4UWDQRplBOE3lVz6jUovIIRDM5rqMPVDmLfDN1OapZWF25+RuhTplr WJjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=ijtoTyfI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id j145-20020a25d297000000b00da07ec3f394si3618988ybg.635.2023.10.27.13.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 13:20:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=ijtoTyfI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 3674A834B100; Fri, 27 Oct 2023 13:20:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346420AbjJ0UUS (ORCPT + 27 others); Fri, 27 Oct 2023 16:20:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbjJ0UUO (ORCPT ); Fri, 27 Oct 2023 16:20:14 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 805B81B5 for ; Fri, 27 Oct 2023 13:20:12 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id 41be03b00d2f7-5b95ee4ae94so30861a12.0 for ; Fri, 27 Oct 2023 13:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698438012; x=1699042812; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=hpZGNvK+8AimoR1c5B/6cfe/M0yZF2viXEDURopJcAk=; b=ijtoTyfIfLp9OtCPostsmsmL/UMWXojbPow/DCb58u28QSAaE760iodJKGA0fc29VX rYhzENEmMht0UBc6Hz++1jorkpfI1XEh8UV7JPRCyBz692I1otqbcJI5L5W71ElWdOKb A83L+AT212XJTqil9VK298nZDJkPMBy74eZqL5HTfTRZXF+Z6O0LH53rDyOzlxPYmLoz W5iI9tceIOrIiFX/PPGOf2UUHnNfWtUNkhJk5aJu+RhbeGxGzwsXAj6vAHXYPWbjkxDP LYin4yVG83kBNuruAiVlu2XTv6MGrtKf1sukUHACr9KkTb8hLObK7QiYGdrVWL+o+u4L S2Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698438012; x=1699042812; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hpZGNvK+8AimoR1c5B/6cfe/M0yZF2viXEDURopJcAk=; b=FaJqsv6T9DtpfCwfa22ZRDlDxi6BBIRngAJRFS67qMpWxXDUDVcpFukNpj0MEPk7hT mlwykGT1fUYOSalQm+ZZ8dvZNQYcBUopD3CVQMYCtuAGze2RosaJdZAiWTvZHIB+6YRh WNqiaABJsC68DEk/xcIMb8VhgbGr0Tj4mrKbnWXnkE2CM44zMU8BkKqVCAaZewD45NND kvzpFBrM0TpyBZN6k9pP0arhwGJ7w7nGrKBPPnpzKW1JYsBRa2mHdvFrJLhHWFrY5gm4 SRUVqSteRCWkO0sVM3jIS1fA0eEXF0saf4HoAXilRflE59CuWcOw6Dn2GWRS9UlRKH2x ypqw== X-Gm-Message-State: AOJu0YxN3D9exMiiaGW0pIpNYbdKPv9NOLB2VsjfSIZRbAXl7E/65nxN gb1qD4KCnLlUH+t6mFV5AD9tjpNonNJs X-Received: from hi-h2o-specialist.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3cef]) (user=arakesh job=sendgmr) by 2002:a63:6d46:0:b0:589:91f7:c89 with SMTP id i67-20020a636d46000000b0058991f70c89mr68069pgc.12.1698438011926; Fri, 27 Oct 2023 13:20:11 -0700 (PDT) Date: Fri, 27 Oct 2023 13:19:58 -0700 In-Reply-To: <20231027201959.1869181-1-arakesh@google.com> Mime-Version: 1.0 References: <73309396-3856-43a2-9a6f-81a40ed594db@google.com> <20231027201959.1869181-1-arakesh@google.com> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog Message-ID: <20231027201959.1869181-3-arakesh@google.com> Subject: [PATCH v9 3/4] usb: gadget: uvc: move video disable logic to its own function From: Avichal Rakesh To: arakesh@google.com, dan.scally@ideasonboard.com Cc: etalvala@google.com, gregkh@linuxfoundation.org, jchowdhary@google.com, laurent.pinchart@ideasonboard.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, m.grzeschik@pengutronix.de X-Spam-Status: No, score=-5.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SORTED_RECIPS,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 27 Oct 2023 13:20:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780941381866226962 X-GMAIL-MSGID: 1780941381866226962 This patch refactors the video disable logic in uvcg_video_enable into its own separate function 'uvcg_video_disable'. This function is now used anywhere uvcg_video_enable(video, 0) was used. Reviewed-by: Daniel Scally Suggested-by: Michael Grzeschik Signed-off-by: Avichal Rakesh --- v6: Introduced this patch to make the next one easier to review v6 -> v7: Add Suggested-by v7 -> v8: No change. Getting back in review queue v8 -> v9: Call uvcg_video_disable directly instead of uvcg_video_enable(video, 0) drivers/usb/gadget/function/uvc_v4l2.c | 6 ++-- drivers/usb/gadget/function/uvc_video.c | 40 ++++++++++++++++--------- drivers/usb/gadget/function/uvc_video.h | 3 +- 3 files changed, 31 insertions(+), 18 deletions(-) -- 2.42.0.820.g83a721a137-goog diff --git a/drivers/usb/gadget/function/uvc_v4l2.c b/drivers/usb/gadget/function/uvc_v4l2.c index 7cb8d027ff0c..904dd283cbf7 100644 --- a/drivers/usb/gadget/function/uvc_v4l2.c +++ b/drivers/usb/gadget/function/uvc_v4l2.c @@ -443,7 +443,7 @@ uvc_v4l2_streamon(struct file *file, void *fh, enum v4l2_buf_type type) return -EINVAL; /* Enable UVC video. */ - ret = uvcg_video_enable(video, 1); + ret = uvcg_video_enable(video); if (ret < 0) return ret; @@ -469,7 +469,7 @@ uvc_v4l2_streamoff(struct file *file, void *fh, enum v4l2_buf_type type) return -EINVAL; uvc->state = UVC_STATE_CONNECTED; - ret = uvcg_video_enable(video, 0); + ret = uvcg_video_disable(video); if (ret < 0) return ret; @@ -515,7 +515,7 @@ static void uvc_v4l2_disable(struct uvc_device *uvc) if (uvc->state == UVC_STATE_STREAMING) uvc->state = UVC_STATE_CONNECTED; - uvcg_video_enable(&uvc->video, 0); + uvcg_video_disable(&uvc->video); uvcg_free_buffers(&uvc->video.queue); uvc->func_connected = false; wake_up_interruptible(&uvc->func_connected_queue); diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c index f8f9209fee50..1081dd790fd6 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -494,31 +494,43 @@ static void uvcg_video_pump(struct work_struct *work) } /* - * Enable or disable the video stream. + * Disable the video stream */ -int uvcg_video_enable(struct uvc_video *video, int enable) +int +uvcg_video_disable(struct uvc_video *video) { - int ret; struct uvc_request *ureq; if (video->ep == NULL) { uvcg_info(&video->uvc->func, - "Video enable failed, device is uninitialized.\n"); + "Video disable failed, device is uninitialized.\n"); return -ENODEV; } - if (!enable) { - cancel_work_sync(&video->pump); - uvcg_queue_cancel(&video->queue, 0); + cancel_work_sync(&video->pump); + uvcg_queue_cancel(&video->queue, 0); - list_for_each_entry(ureq, &video->ureqs, list) { - if (ureq->req) - usb_ep_dequeue(video->ep, ureq->req); - } + list_for_each_entry(ureq, &video->ureqs, list) { + if (ureq->req) + usb_ep_dequeue(video->ep, ureq->req); + } - uvc_video_free_requests(video); - uvcg_queue_enable(&video->queue, 0); - return 0; + uvc_video_free_requests(video); + uvcg_queue_enable(&video->queue, 0); + return 0; +} + +/* + * Enable the video stream. + */ +int uvcg_video_enable(struct uvc_video *video) +{ + int ret; + + if (video->ep == NULL) { + uvcg_info(&video->uvc->func, + "Video enable failed, device is uninitialized.\n"); + return -ENODEV; } if ((ret = uvcg_queue_enable(&video->queue, 1)) < 0) diff --git a/drivers/usb/gadget/function/uvc_video.h b/drivers/usb/gadget/function/uvc_video.h index 03adeefa343b..8ef6259741f1 100644 --- a/drivers/usb/gadget/function/uvc_video.h +++ b/drivers/usb/gadget/function/uvc_video.h @@ -14,7 +14,8 @@ struct uvc_video; -int uvcg_video_enable(struct uvc_video *video, int enable); +int uvcg_video_enable(struct uvc_video *video); +int uvcg_video_disable(struct uvc_video *video); int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc);