From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from canpmsgout06.his.huawei.com (canpmsgout06.his.huawei.com [113.46.200.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3AA683803D1; Mon, 20 Apr 2026 03:57:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.221 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776657454; cv=none; b=ulCWkT4GoMHPKP53qDka0rBCg+epjxFqqs7A7Vk5FYPi960qLYrMrPk/kyVkS86/yoAXdETdRUcHFuHMGV5fKFtMZKC34AhncGBg0xx6I+QptLjYHUC/sgVLqny1r8vDmg+UsyeCq1t980IjJwv7qkJOg8ophjjDRm1ga5ZwhI0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776657454; c=relaxed/simple; bh=/DwIQWfY5//owc51JwHn7VqUePVGUACM6pw0ea8nNhY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KvGLTdgR3JFJBqIN3IZIt7zhiiDmVRYPDwsy1Hto8FoYbtcNdlwC23waJGrhXmbtH6+zzGrSyWC1hRbtfauQ3PfJkP8HRclcavNjUDoUV+bRZsjHCsVZaVM7Yfa1K2Op77V4YBp62GwPbH1XzGMV9Sx/7cwyoVSI928SkhRtAIw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=h-partners.com; dkim=pass (1024-bit key) header.d=h-partners.com header.i=@h-partners.com header.b=eBU0B3cu; arc=none smtp.client-ip=113.46.200.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=h-partners.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=h-partners.com header.i=@h-partners.com header.b="eBU0B3cu" dkim-signature: v=1; a=rsa-sha256; d=h-partners.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=63b7WHVxZ4IhGyqurm703PYoxhN4AhlIQm8VHhGUeBU=; b=eBU0B3cuxm2ItmR+w9kxRiBecQ/DALu59kuiJns2cV2sPw8jnswiXvwZCMtHUbJJEcn8KbHGz ZXCZB4GdHYVKsNaVHGuAZQgOUM0A10CLgkr+DeYbxzLJJIP7p7mblBEDYS33pKMIyBHRods5WbV o708VKPUrnBHfScyDrNQGtQ= Received: from mail.maildlp.com (unknown [172.19.163.0]) by canpmsgout06.his.huawei.com (SkyGuard) with ESMTPS id 4fzWjz4tNSzRhQx; Mon, 20 Apr 2026 11:51:03 +0800 (CST) Received: from dggemv706-chm.china.huawei.com (unknown [10.3.19.33]) by mail.maildlp.com (Postfix) with ESMTPS id E729E40537; Mon, 20 Apr 2026 11:57:24 +0800 (CST) Received: from kwepemn100009.china.huawei.com (7.202.194.112) by dggemv706-chm.china.huawei.com (10.3.19.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 20 Apr 2026 11:57:24 +0800 Received: from localhost.localdomain (10.50.163.32) by kwepemn100009.china.huawei.com (7.202.194.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.36; Mon, 20 Apr 2026 11:57:24 +0800 From: Huisong Li To: , , , , CC: , , , , Subject: [PATCH v1 2/2] usb: gadget: udc: simplify connect_lock holding using guards Date: Mon, 20 Apr 2026 11:57:22 +0800 Message-ID: <20260420035722.1133418-3-lihuisong@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260420035722.1133418-1-lihuisong@huawei.com> References: <20260420035722.1133418-1-lihuisong@huawei.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: kwepems100002.china.huawei.com (7.221.188.206) To kwepemn100009.china.huawei.com (7.202.194.112) Use guard() and scoped_guard() to manage connect_lock to simplify the code in gadget_bind_driver() and gadget_unbind_driver(). Signed-off-by: Huisong Li --- drivers/usb/gadget/udc/core.c | 53 ++++++++++++++++------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index e3f27fb39e9e..1d615a870907 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -1630,31 +1630,26 @@ static int gadget_bind_driver(struct device *dev) if (ret) goto err_bind; - mutex_lock(&udc->connect_lock); - ret = usb_gadget_udc_start_locked(udc); - if (ret) { - mutex_unlock(&udc->connect_lock); - goto err_start; + scoped_guard(mutex, &udc->connect_lock) { + ret = usb_gadget_udc_start_locked(udc); + if (ret) + goto err_start; + usb_gadget_enable_async_callbacks(udc); + udc->allow_connect = true; + ret = usb_udc_connect_control_locked(udc); + if (ret) { + udc->allow_connect = false; + usb_gadget_disable_async_callbacks(udc); + if (gadget->irq) + synchronize_irq(gadget->irq); + usb_gadget_udc_stop_locked(udc); + goto err_start; + } } - usb_gadget_enable_async_callbacks(udc); - udc->allow_connect = true; - ret = usb_udc_connect_control_locked(udc); - if (ret) - goto err_connect_control; - - mutex_unlock(&udc->connect_lock); kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE); return 0; - err_connect_control: - udc->allow_connect = false; - usb_gadget_disable_async_callbacks(udc); - if (gadget->irq) - synchronize_irq(gadget->irq); - usb_gadget_udc_stop_locked(udc); - mutex_unlock(&udc->connect_lock); - err_start: driver->unbind(udc->gadget); @@ -1680,18 +1675,18 @@ static void gadget_unbind_driver(struct device *dev) udc->allow_connect = false; cancel_work_sync(&udc->vbus_work); - mutex_lock(&udc->connect_lock); - usb_gadget_disconnect_locked(gadget); - usb_gadget_disable_async_callbacks(udc); - if (gadget->irq) - synchronize_irq(gadget->irq); - mutex_unlock(&udc->connect_lock); + scoped_guard(mutex, &udc->connect_lock) { + usb_gadget_disconnect_locked(gadget); + usb_gadget_disable_async_callbacks(udc); + if (gadget->irq) + synchronize_irq(gadget->irq); + } udc->driver->unbind(gadget); - mutex_lock(&udc->connect_lock); - usb_gadget_udc_stop_locked(udc); - mutex_unlock(&udc->connect_lock); + scoped_guard(mutex, &udc->connect_lock) { + usb_gadget_udc_stop_locked(udc); + } scoped_guard(mutex, &udc_lock) { driver->is_bound = false; -- 2.33.0