From patchwork Wed Jan 17 12:26:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 188818 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:42cf:b0:101:a8e8:374 with SMTP id q15csp871723dye; Wed, 17 Jan 2024 04:28:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IH98/fG7EGsKIpSTnT5D798wwcinjkXoELkOGtJteHVI9rlh0aKaOgwTicnNWYtWtRUMy3O X-Received: by 2002:a17:906:3a8a:b0:a2e:d4d8:5b3c with SMTP id y10-20020a1709063a8a00b00a2ed4d85b3cmr299422ejd.53.1705494499263; Wed, 17 Jan 2024 04:28:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705494499; cv=pass; d=google.com; s=arc-20160816; b=Ii397yM+DReSPeI+Av6mtdBrkc9V4vurDWHJWNlgrFOJU4WiD3DQGKLTN1mvQzDgOx tySpHyrgbrDpKlVVr3oFfH9EguZdX775IAjeHBhWqnDGcA/j+GGZz0iQ2BZEUUi4XuKL smPBWVfZ38N5BiOlj4ssiqodkM9xNbfEbwAHxVMP1ZWCnEn2VIufQ2YaDMz/O5mTXczO xp2RcLLnaKLB4/CmdCNNnpC9isV4p1tgQlB82uiUuu7rKEkCjz1IRAgDtm6eX2iF3CmR UNPTMbrJETaNgwWe5GBCEC6vnAgq1jBMrIZReUhBulqw4fXnpSRDE4EsaPseIHix172g Porg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=PFENih9XWAd70944xbCOau+9oHw/D103WR9u3LQvnx8=; fh=3Xwiw3h4BuSZxa4g5nlxoJvEg1Pn4zGp9h0k4mfsabo=; b=tof5fPGfQQqRWAD3p3YtD3dHLao07jvLQ95ctbRGSieN+4NLgo7+2UtBJte5khVV8K 4pMrw1V+p7yo8vqhG2MkRShtNiwQY/JuJjZ94Z914rIYeHW8cFMQHBa7E/duoI/V7OEP gcLZexu5ngq0yQ8p6oXQMBgoY2PxYJs06d3YEsN9P3+2x42IiuAqhNsyoOhmwkJk1IZr nX0e8em0eqSukWQF05tVzHqe6JDVa3pXjwtuwLtupWyBooILY/5q1sZrC2AFeQizS4OH rSZ75+/kxDVPG3vFHPhU2y87zy+z+mfoEygGlN6Dj4ameF/Wt22MrGJUfQQdZG3gVFbq zpaw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=zdpoXYtl; arc=pass (i=1 spf=pass spfdomain=crapouillou.net dkim=pass dkdomain=crapouillou.net dmarc=pass fromdomain=crapouillou.net); spf=pass (google.com: domain of linux-kernel+bounces-28961-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28961-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ka21-20020a170907991500b00a27873a068fsi5772352ejc.30.2024.01.17.04.28.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 04:28:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-28961-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@crapouillou.net header.s=mail header.b=zdpoXYtl; arc=pass (i=1 spf=pass spfdomain=crapouillou.net dkim=pass dkdomain=crapouillou.net dmarc=pass fromdomain=crapouillou.net); spf=pass (google.com: domain of linux-kernel+bounces-28961-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-28961-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DC8F51F25AE3 for ; Wed, 17 Jan 2024 12:28:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B647C1F94B; Wed, 17 Jan 2024 12:27:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="zdpoXYtl" Received: from aposti.net (aposti.net [89.234.176.197]) (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 BA7041F5F0; Wed, 17 Jan 2024 12:27:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=89.234.176.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705494433; cv=none; b=dO9Ru4yXe3QfwdxIiDiI7e3TXOkEtn5qKigIWIV0y6sxzHWPd9V66O+bKCE1VgCpxYx/VnFYzyP21Rg9EV0OyAUcjIVOULfXYLw+ZQC2VSUj3tsyhNVhglvuE40xPRMtYGZx2b/8yX4Pf78Xmm4WxXS/QyfMGdscpZ8FyybMPp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705494433; c=relaxed/simple; bh=ulEjlAZ2D8bQ3nhph/YUQbd+dlZj+pir5iq1If3tF7Q=; h=DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:X-Spam; b=lhrHsH9ouXM/bqcsTnKuL4HFY/YadpcrH9du4cQ+5mbIxkPkuQTtMTv4vNFVu0riIEJUFXuWk7IvLDfBarCTE7nclacnlBjKSEjnAcRaCJ87yPuDSmhPnI0zyb0OxNsCCxjoSdyZCX3inPf5jgjjNewBAAuiEsLxvsur7gSJ2Gg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=crapouillou.net; spf=pass smtp.mailfrom=crapouillou.net; dkim=pass (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b=zdpoXYtl; arc=none smtp.client-ip=89.234.176.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=crapouillou.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=crapouillou.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1705494414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PFENih9XWAd70944xbCOau+9oHw/D103WR9u3LQvnx8=; b=zdpoXYtlbEWohSWSZ5pcgUFvnMyEH/qg+1FZLH9oUOoWLl4KS13vJWJKFNo++e7pm0lgbD 6vlH83/2CrpoOyg5jRst4DT2dCK5WthcOzUHt2MLFOGo6EIHTxPBm48rnnjDiRDLtXtZ7h 7WccjouMbwBKfABUgZkLYSmkfPGUuVs= From: Paul Cercueil To: Greg Kroah-Hartman , Jonathan Corbet , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= Cc: Jonathan Cameron , =?utf-8?q?Nuno_S=C3=A1?= , Michael Hennerich , linux-usb@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, Paul Cercueil Subject: [PATCH v4 2/4] usb: gadget: functionfs: Factorize wait-for-endpoint code Date: Wed, 17 Jan 2024 13:26:44 +0100 Message-ID: <20240117122646.41616-3-paul@crapouillou.net> In-Reply-To: <20240117122646.41616-1-paul@crapouillou.net> References: <20240117122646.41616-1-paul@crapouillou.net> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam: Yes X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788340599868647446 X-GMAIL-MSGID: 1788340599868647446 This exact same code was duplicated in two different places. Signed-off-by: Paul Cercueil --- drivers/usb/gadget/function/f_fs.c | 48 +++++++++++++++++------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 6bff6cb93789..ed2a6d5fcef7 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -934,31 +934,44 @@ static ssize_t __ffs_epfile_read_data(struct ffs_epfile *epfile, return ret; } -static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) +static struct ffs_ep *ffs_epfile_wait_ep(struct file *file) { struct ffs_epfile *epfile = file->private_data; - struct usb_request *req; struct ffs_ep *ep; - char *data = NULL; - ssize_t ret, data_len = -EINVAL; - int halt; - - /* Are we still active? */ - if (WARN_ON(epfile->ffs->state != FFS_ACTIVE)) - return -ENODEV; + int ret; /* Wait for endpoint to be enabled */ ep = epfile->ep; if (!ep) { if (file->f_flags & O_NONBLOCK) - return -EAGAIN; + return ERR_PTR(-EAGAIN); ret = wait_event_interruptible( epfile->ffs->wait, (ep = epfile->ep)); if (ret) - return -EINTR; + return ERR_PTR(-EINTR); } + return ep; +} + +static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data) +{ + struct ffs_epfile *epfile = file->private_data; + struct usb_request *req; + struct ffs_ep *ep; + char *data = NULL; + ssize_t ret, data_len = -EINVAL; + int halt; + + /* Are we still active? */ + if (WARN_ON(epfile->ffs->state != FFS_ACTIVE)) + return -ENODEV; + + ep = ffs_epfile_wait_ep(file); + if (IS_ERR(ep)) + return PTR_ERR(ep); + /* Do we halt? */ halt = (!io_data->read == !epfile->in); if (halt && epfile->isoc) @@ -1280,16 +1293,9 @@ static long ffs_epfile_ioctl(struct file *file, unsigned code, return -ENODEV; /* Wait for endpoint to be enabled */ - ep = epfile->ep; - if (!ep) { - if (file->f_flags & O_NONBLOCK) - return -EAGAIN; - - ret = wait_event_interruptible( - epfile->ffs->wait, (ep = epfile->ep)); - if (ret) - return -EINTR; - } + ep = ffs_epfile_wait_ep(file); + if (IS_ERR(ep)) + return PTR_ERR(ep); spin_lock_irq(&epfile->ffs->eps_lock);