From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 506E0C43458 for ; Wed, 1 Jul 2026 23:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oRa6Mfv2Q0BSdpN6A9ei8/7QBl84L+BtowmBzSy6B+k=; b=L9O5ZOfqMCLtEhYTh3KerT4snA H4ESLoBO4ldi4BmydDbvPgidNtJi39PT4u1PP6WbrNbpsY7zIchRZMBnqqBWiCe1fq+xH0VR+9VxB IDT/7OyQr1pTkxHnYtyfoTQlGsk5dZ17cljREVnF1+XoKn2BK/aonUdJ8Gx7EjJOY+b6jSVFmVQwM PADxKKLAA9GpjUERyA7aaxCYKsbx6FG9Oa4cTanPRY0jTHhX6svuTGneVBb9PHpYyOBvRnW+0icaL smayNeMvvnG73eRnTaJM04hVY7eTPh6cvhZTNeEnlbc7lYgNzR2clrsCypidUPhZkVbCQDTKSTNlJ gsr1BPBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wf4bu-00000003E1q-3SGR; Wed, 01 Jul 2026 23:44:54 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wf4bo-00000003Dsl-0v5z; Wed, 01 Jul 2026 23:44:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1782949486; bh=zENi69Um11uU524KG8ZT0u+uCO1jqfR48V5n4jhR7ws=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=B/ECViDWihZFOfWlCJ2q1OURuYsV/Z2b3vrFYNevPypzJgj5NWpM/j+ZJQ97zGnlo D6mV5ovIsgTOvMGZbsrYU3kWlMiwx4GA87eZgUVbdCvVdLpSlDRVGqdEwsQkPDmvXR I14OSjQyjc2tyqrnsFVSoKbymo+C+A/A9UkKEoHXAUeuSb2SHY1dmz4hEidyGxWUga kOB2WkNOmWxx/QpSji0XN4zbO7god00pPKT02VrjxLk9zUyVZqIYJBbe5cGVzMaGpV Sl0KYoXy3RkqSPct50nBXLvC9tH+YwaIzMjUCswdaZnG4FhD8uFl6oPHUbbPCuljeU vQknVu0fiiGIQ== Received: from jupiter.universe (unknown [100.64.1.62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id C092417E0FAA; Thu, 2 Jul 2026 01:44:45 +0200 (CEST) Received: by jupiter.universe (Postfix, from userid 1000) id CEA73480069; Thu, 02 Jul 2026 01:35:48 +0200 (CEST) From: Sebastian Reichel Date: Thu, 02 Jul 2026 01:36:01 +0200 Subject: [PATCH v9 23/38] phy: rockchip: usbdp: Use guard functions for mutex MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260702-rockchip-usbdp-cleanup-v9-23-e31efbb62d2e@collabora.com> References: <20260702-rockchip-usbdp-cleanup-v9-0-e31efbb62d2e@collabora.com> In-Reply-To: <20260702-rockchip-usbdp-cleanup-v9-0-e31efbb62d2e@collabora.com> To: Vinod Koul , Neil Armstrong , Heiko Stuebner , Frank Wang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thinh Nguyen , Greg Kroah-Hartman Cc: Andy Yan , Dmitry Baryshkov , Yubing Zhang , Alexey Charkov , linux-phy@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, devicetree@vger.kernel.org, linux-usb@vger.kernel.org, Sebastian Reichel X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4395; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=zENi69Um11uU524KG8ZT0u+uCO1jqfR48V5n4jhR7ws=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGpFpFTb4sz8pLoBRi9gVQlSlRqL4PbE0Az0d 9/ftw7J2IdXHokCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJqRaRUAAoJENju1/PI O/qazHQP/0syXkEYZeyHWORrGEQwdRqaM982n5t6SAv6MtbnWqpUGwN2SnC9eCsW0z3kMCsmHgV 4rq6Yy+LUiRhaEDBELEZUKVt28VizY/wnnouvTaAX5IoWDEaDoMgYeFmuMmNbp6Po5dktFvwUaQ fvvutjLlTQBbC07xLzINXK4qh+ckznkVIsmGIWlygKDBwp/b8djYw6Jcof3eiYtgyR+AweGYVtR JxA1JXZMJek9hEnB7QIPnAXSX55kio4+EBm3D9RaQwqiBG+2Sd6qF1NEWvnnLsRpGJsXtcAi+g1 feIptpxOt1iX02eezCtXhN0jSj9THnEvqbgu7367xpgOyBAKPAzBQv10Mg6ErB96jDGKHxaP1ru XooAAwaPfTfZ8rukJ9qN7Cdre8Yo1y8vN+LnwA2Oln5QCNGtyxdvLskcl7E8X9XVFlqRNVC879y Upr/+BA14qCD/Dq8hpScw1THiSUfT6HryYgpIeJ0mz4GGw2AJlIHGNLBEskgzRBGyKCi+abHtEH Vy66/hyha6nFUfGW+/RcZ6vZayUMYAH5kLr+UN70oKAa1c15bWnwOcgA01REqkwT72G3n8zdbAu v3IDjaFjWsaI9lvdTbJRrtYFswNlBiJnv2/wtCqKbg9XqGcbRjVGZnHiQNOFhKOCPBtxrYdkLy+ R4nKkNb/m/c1pU4s43I0gaA== X-Developer-Key: i=sebastian.reichel@collabora.com; a=openpgp; fpr=EF660D07463F8B726A795413D8EED7F3C83BFA9A X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260701_164448_425502_BB918A41 X-CRM114-Status: GOOD ( 15.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert the driver to use guard functions for mutex handling as a small cleanup. There is a small functional change in the DP PHY power up function, which no longer sleeps if the internal powerup code returns an error. This is not a problem as the sleep is only relevant for successful power-up. Signed-off-by: Sebastian Reichel --- drivers/phy/rockchip/phy-rockchip-usbdp.c | 54 +++++++++++++------------------ 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-usbdp.c b/drivers/phy/rockchip/phy-rockchip-usbdp.c index 9f0c0127e6d0..bf6e7edbe631 100644 --- a/drivers/phy/rockchip/phy-rockchip-usbdp.c +++ b/drivers/phy/rockchip/phy-rockchip-usbdp.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -656,14 +657,15 @@ static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, struct rk_udphy *udphy = typec_switch_get_drvdata(sw); bool flipped = orien == TYPEC_ORIENTATION_REVERSE; - mutex_lock(&udphy->mutex); + guard(mutex)(&udphy->mutex); if (orien == TYPEC_ORIENTATION_NONE) { gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 0); gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 0); /* unattached */ rk_udphy_usb_bvalid_enable(udphy, false); - goto unlock_ret; + + return 0; } if (udphy->flip != flipped) @@ -673,8 +675,6 @@ static int rk_udphy_orien_sw_set(struct typec_switch_dev *sw, rk_udphy_set_typec_default_mapping(udphy); rk_udphy_usb_bvalid_enable(udphy, true); -unlock_ret: - mutex_unlock(&udphy->mutex); return 0; } @@ -1056,26 +1056,25 @@ static int rk_udphy_dp_phy_power_on(struct phy *phy) struct rk_udphy *udphy = phy_get_drvdata(phy); int ret; - mutex_lock(&udphy->mutex); + scoped_guard(mutex, &udphy->mutex) { + phy_set_bus_width(phy, udphy->dp_lanes); - phy_set_bus_width(phy, udphy->dp_lanes); - - ret = rk_udphy_power_on(udphy, UDPHY_MODE_DP); - if (ret) - goto unlock; + ret = rk_udphy_power_on(udphy, UDPHY_MODE_DP); + if (ret) + return ret; - rk_udphy_dp_lane_enable(udphy, udphy->dp_lanes); + rk_udphy_dp_lane_enable(udphy, udphy->dp_lanes); - rk_udphy_dp_lane_select(udphy); + rk_udphy_dp_lane_select(udphy); + } -unlock: - mutex_unlock(&udphy->mutex); /* * If data send by aux channel too fast after phy power on, * the aux may be not ready which will cause aux error. Adding * delay to avoid this issue. */ usleep_range(10000, 11000); + return ret; } @@ -1083,10 +1082,10 @@ static int rk_udphy_dp_phy_power_off(struct phy *phy) { struct rk_udphy *udphy = phy_get_drvdata(phy); - mutex_lock(&udphy->mutex); + guard(mutex)(&udphy->mutex); + rk_udphy_dp_lane_enable(udphy, 0); rk_udphy_power_off(udphy, UDPHY_MODE_DP); - mutex_unlock(&udphy->mutex); return 0; } @@ -1291,35 +1290,30 @@ static const struct phy_ops rk_udphy_dp_phy_ops = { static int rk_udphy_usb3_phy_init(struct phy *phy) { struct rk_udphy *udphy = phy_get_drvdata(phy); - int ret = 0; - mutex_lock(&udphy->mutex); + guard(mutex)(&udphy->mutex); + /* DP only or high-speed, disable U3 port */ if (!(udphy->mode & UDPHY_MODE_USB) || udphy->hs) { rk_udphy_u3_port_disable(udphy, true); - goto unlock; + return 0; } - ret = rk_udphy_power_on(udphy, UDPHY_MODE_USB); - -unlock: - mutex_unlock(&udphy->mutex); - return ret; + return rk_udphy_power_on(udphy, UDPHY_MODE_USB); } static int rk_udphy_usb3_phy_exit(struct phy *phy) { struct rk_udphy *udphy = phy_get_drvdata(phy); - mutex_lock(&udphy->mutex); + guard(mutex)(&udphy->mutex); + /* DP only or high-speed */ if (!(udphy->mode & UDPHY_MODE_USB) || udphy->hs) - goto unlock; + return 0; rk_udphy_power_off(udphy, UDPHY_MODE_USB); -unlock: - mutex_unlock(&udphy->mutex); return 0; } @@ -1351,12 +1345,10 @@ static int rk_udphy_typec_mux_set(struct typec_mux_dev *mux, if (!rk_udphy_is_supported_mode(state)) return 0; - mutex_lock(&udphy->mutex); + guard(mutex)(&udphy->mutex); rk_udphy_set_typec_state(udphy, state->mode); - mutex_unlock(&udphy->mutex); - return 0; } -- 2.53.0