From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 B4D74407CED; Wed, 1 Jul 2026 23:44:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782949489; cv=none; b=hFH51rfPq6AKG0Rut2oTWVFHnsJENICPk+ePaZhXgOBwP3kO6ldAV8mmMv9DCG01nsM55HG5nYztMplIsywh8l0NKpmJ0Bz0bi+Ga+o1b5iRKZQCj3179U1ofgmX3rxgExo+c95slmorH+gUyiFVBaeorjDoN/viE3FYu99bw3w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782949489; c=relaxed/simple; bh=zENi69Um11uU524KG8ZT0u+uCO1jqfR48V5n4jhR7ws=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uvvLHVT7mfriy6uVpeQzyTQdlRm95AfALRpsB+pVFzIvAjYZzxFGuxYlPkQwc8dkX4N5yLYQ55CaIkPc1wpfE/X+ALLVlBXO0a+lPrRAGuyWXvS/fhNw3ooLuBsCSBwXnkDi6fmkV7gL5eaMMi3MnvejsyLgedCP7DM0r5CSZhU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=B/ECViDW; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="B/ECViDW" 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 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 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