From patchwork Tue Oct 24 18:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avichal Rakesh X-Patchwork-Id: 157667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce89:0:b0:403:3b70:6f57 with SMTP id p9csp2133775vqx; Tue, 24 Oct 2023 11:36:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGfZXuui1XzUHXIFPGg/xEq8XXXeYSvdt6opV0qP1TX2TmI65l+Qo2XRoWx58Et5nFphvv/ X-Received: by 2002:a05:6a00:2d10:b0:6b6:5ed4:dd42 with SMTP id fa16-20020a056a002d1000b006b65ed4dd42mr16389920pfb.31.1698172597091; Tue, 24 Oct 2023 11:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698172597; cv=none; d=google.com; s=arc-20160816; b=07hDR+QeI6oUIMEwpaQWs55Pvb7zCbLG2rk9IXgb2LcowkEiabMoLWrD9TNQFqblfm BqLoj+mVlIZz04vkfiStFKHvGw4P/NgN10J9sgdYSWWGl2iko/MVjT+GP8R0B90S/Gm5 F6We1LZkIFF9GgqCp3HVLWreGCvTEO0so2gycjxhq2XOo3UrIU8nlrd6ZptHPSWOSkY9 PRspADMQtVSpLu2u9aSYOddnQ3LoBwawhHKXx5jjqdP3jmrwrXdmNumKYUJfvM5FHaOl MBto2b+5CKm+VDHdYhaPF2EcSmjBYBFhN1O/uul1qyMvKImYeJ4rdNPdgOO0geIaT2uF zDBQ== 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=Y4WZ1HmvUmacPvyIaR17cHvCpQJGXPJrdUyEy8+V7mI=; fh=mNRU094uygHtWEbbVt2iuJXx5ZS7icP/BgRleDWzkbQ=; b=xd0ldSB0pbuzO+moXgf5kUdapJV0Y3xeIf35k4jfY1yKdN3eCfhzSC1XWsEXfhkkOF HY252ClQqcknH6V95f3Hibz4VXAqZ1UabHrUy+s5mYqYQYBg2ls/HEe2rQyC0o3tC83X jxcySCRDbLmAFBRMIaHDzkR7/SZu5PQuLpIYv31aJeQ59+z1ADVFWRhycpRQYEbYIocb dI4xcVVoTmEbyyGe9JQBvHdVIzrLhucZFBkzucNDs1LlALtWoAvZJbh0vYnO7c0Nz6he edOwUUnv9oQwbYT3yc9fpTan63V7estMCJgKraJNRFqCiXszeqJAHnkJp2rOkSzW21NX d/Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=09WLSfof; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id j17-20020a62b611000000b00690da053918si8479638pff.4.2023.10.24.11.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 11:36:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=09WLSfof; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 0AB028027956; Tue, 24 Oct 2023 11:36:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344204AbjJXSgY (ORCPT + 27 others); Tue, 24 Oct 2023 14:36:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344151AbjJXSgR (ORCPT ); Tue, 24 Oct 2023 14:36:17 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A1C29F for ; Tue, 24 Oct 2023 11:36:15 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-5a08e5c7debso3151085a12.2 for ; Tue, 24 Oct 2023 11:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1698172575; x=1698777375; 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=Y4WZ1HmvUmacPvyIaR17cHvCpQJGXPJrdUyEy8+V7mI=; b=09WLSfofrd7WGFjn9ZyNZ84zvC2k/UnSEETZ+SZSRHKu8PDZ8FVndiHnZU359dB3eH 1KuT8iJOV2M4qoB3LO7GPsyXf+lkKCpErwhw1RA4njpyIO/jfAKR06jPjkRF2E/7T2EF 90CZp1IUk1JnyT58p02VKJ5l2i6SY9P+ZkTTUIythZCgy5DIsJqDlur2fNO52rtt1rxx jmoTKXONpSaI6a0QOKoPsV7uFXnHTOsagJa1C8WsD4pMAhCzKr0PpzqGuMwOiI9grbdh U6zAXk7W1l6a6KQvL6nCqE78hIw5R4nyUB5HmHWtbOHAGDjphwCpCMY58uMvrAv8KrTA HjzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698172575; x=1698777375; 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=Y4WZ1HmvUmacPvyIaR17cHvCpQJGXPJrdUyEy8+V7mI=; b=eocymeuAbYhhuTrDtG6j4vFl/agSVIgqS9MfhoNHrdim62Os8RDvj16skSBIY1Ih2g 9AYpFP7DXQv+hrvalw+825Aea5VRQTgmKAjthKKMZa0nGkUSvexS559EScO0VB7HBDKn YyJ4GGc40vTElv5GYUasTNa9t9gfvVbGAKi8Qrd1ZpgJxIEAei4Tjss/xj37KhwiyvMI 8vxTh3N41WjZs+UJSQfoOIE1+ZKk4eTVyD7+8gCq1w7UMG42T2xjPKZIsmIH3RoeIqWB 0/jl/W6PlfAcuv5M3+5xh/Iz+QsZiafBWZ7pz2FrccNZHBzEBbjN7aHM4zsLYIE98ep/ e1zg== X-Gm-Message-State: AOJu0Yz6nu7Gur0BjsvGJFb+vOHEJZ+jBFJggV06LtSINo36vjSVQtro jFMQU1Wj3k0vUFDyHE1rELc+XiY5M3ZO X-Received: from hi-h2o-specialist.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3cef]) (user=arakesh job=sendgmr) by 2002:a05:6a02:68c:b0:589:86ae:2107 with SMTP id ca12-20020a056a02068c00b0058986ae2107mr299068pgb.9.1698172574872; Tue, 24 Oct 2023 11:36:14 -0700 (PDT) Date: Tue, 24 Oct 2023 11:36:04 -0700 In-Reply-To: <20231024183605.908253-1-arakesh@google.com> Mime-Version: 1.0 References: <20231019185319.2714000-1-arakesh@google.com> <20231024183605.908253-1-arakesh@google.com> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog Message-ID: <20231024183605.908253-3-arakesh@google.com> Subject: [PATCH v8 3/4] usb: gadget: uvc: move video disable logic to its own function From: Avichal Rakesh To: arakesh@google.com, dan.scally@ideasonboard.com, gregkh@linuxfoundation.org, laurent.pinchart@ideasonboard.com Cc: etalvala@google.com, jchowdhary@google.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, m.grzeschik@pengutronix.de X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Tue, 24 Oct 2023 11:36:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780211146243827697 X-GMAIL-MSGID: 1780663028832415730 This patch refactors the video disable logic in uvcg_video_enable into its own separate function 'uvcg_video_disable'. 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 drivers/usb/gadget/function/uvc_video.c | 37 +++++++++++++++---------- 1 file changed, 23 insertions(+), 14 deletions(-) -- 2.42.0.758.gaed0368e0e-goog diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c index c180866c8e34..80b8eaea2d39 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c @@ -493,13 +493,33 @@ static void uvcg_video_pump(struct work_struct *work) return; } +/* + * Disable video stream + */ +static int +uvcg_video_disable(struct uvc_video *video) +{ + struct uvc_request *ureq; + + 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); + } + + uvc_video_free_requests(video); + uvcg_queue_enable(&video->queue, 0); + return 0; +} + /* * Enable or disable the video stream. */ int uvcg_video_enable(struct uvc_video *video, int enable) { int ret; - struct uvc_request *ureq; if (video->ep == NULL) { uvcg_info(&video->uvc->func, @@ -507,19 +527,8 @@ int uvcg_video_enable(struct uvc_video *video, int enable) return -ENODEV; } - if (!enable) { - 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); - } - - uvc_video_free_requests(video); - uvcg_queue_enable(&video->queue, 0); - return 0; - } + if (!enable) + return uvcg_video_disable(video); if ((ret = uvcg_queue_enable(&video->queue, 1)) < 0) return ret;