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 C4255C5DF6A for ; Thu, 13 Aug 2026 20:53:32 +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=2udkv5oTvr2w60iWIa2vo9eRRJ1bBpargxkMBUxNOFg=; b=0xEEHLQn2mmygyBpGocCcW2NOM rRP2ivBOn2rujL3fDwPBC6zQH94N7f+fwQX15g0xs5Qvij2D/4T4cvc8GtU6vem7H+s3T+PPb/kag jRigaOSAo+cDMFDT8E25SApwGDe//a+8SUm/mOOx3d0YrcWPLHPHu2pGHh04UoGq8srInUJX3DV6B 2ueFrJVUPK7jO4pU2YivSKMP1c35lZ1JTP0F6DD7iPHNeG/JlPvaulfE+pQYvCHqNwHabYqJcrqIG PTRLC1cC+cpycnZZQLJR+X0BC11I9he7Bv0NxIchzR9qhVlgIDjRd1lgG8ufNjhjzaDW7mAzl/zil 2adY8E7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wucQA-00000001Yof-2WNi; Thu, 13 Aug 2026 20:53:02 +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 1wucPD-00000001XId-27H1; Thu, 13 Aug 2026 20:52:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1786654310; bh=cv6Gh+wytcASTFUf1MxQfGAfXrJjRqU6YO9TMBuvqIg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=pv/gLjrxpCO+3809dUW/vLF3wpziO53idY5W5P36O/muFieqSMSsPdUb/DcpxEv9T +8bXxCrwTv1lBGUqw0w5T6mzQFHLGtXFooGzpuPSkJ3Fhgzdi1DAhcfrWEKdbSYm5w bOlS1bpJLzI6SD1ulykG9Rf0npEZWILykSaJCMv3p2mYYLyedjvWXa8/SsivWGAaIa /xk265kLyBW782ZN0Ft7zlm7MigWen8lydeAiMo5oIvqhTIi6hnP1vwHDoT2PNnTA1 4p6Tk3xr1MeWm3SXsodTlYfAfqc9tpyFBq8r2vhc8t6PSMS1KBZ9/4s7D8+p5McFXO miNRdN1nN8YYA== 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) (No client certificate requested) (Authenticated sender: sre) by bali.collaboradmins.com (Postfix) with ESMTPSA id AD08917E141B; Thu, 13 Aug 2026 22:51:50 +0200 (CEST) Received: by jupiter.universe (Postfix, from userid 1000) id B6401480068; Thu, 13 Aug 2026 22:51:49 +0200 (CEST) From: Sebastian Reichel Date: Thu, 13 Aug 2026 22:52:05 +0200 Subject: [PATCH v14 22/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: <20260813-rockchip-usbdp-cleanup-v14-22-b5ad9c68fa11@collabora.com> References: <20260813-rockchip-usbdp-cleanup-v14-0-b5ad9c68fa11@collabora.com> In-Reply-To: <20260813-rockchip-usbdp-cleanup-v14-0-b5ad9c68fa11@collabora.com> To: Vinod Koul , Manivannan Sadhasivam , Neil Armstrong , Heiko Stuebner , Frank Wang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thinh Nguyen , Greg Kroah-Hartman , Philipp Zabel Cc: Andy Yan , Dmitry Baryshkov , Yubing Zhang , Alexey Charkov , Igor Paunovic , 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.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4464; i=sebastian.reichel@collabora.com; h=from:subject:message-id; bh=cv6Gh+wytcASTFUf1MxQfGAfXrJjRqU6YO9TMBuvqIg=; b=owJ4nAFtApL9kA0DAAoB2O7X88g7+poByyZiAGp+LmSDBZlSXrCuI9DdCrca+Z3Po8YRhIqtz BaRIwuxM65LHYkCMwQAAQoAHRYhBO9mDQdGP4tyanlUE9ju1/PIO/qaBQJqfi5kAAoJENju1/PI O/qaQQIP/Am4zFYuM3OukuWb7qY+mRXTQJqfQKsi/J83sX8iIiUGI34c7YQOb7xq1euPcBermTX EDVZKk5xwpHi37hyR6V4J2LKeDbyNXz9E11C86lBPPTx2o6MAhCzAtm+OyzBztQcwcXi4L14m/6 0r1k7crdgxKBR/k+Eo/whsw2funbzcp3/ql5SYC1w7TUf7gQmZwnYd9bsQeFv4F6iYej+3sSgSK KMGrr6MYEuTuWq5RvwjBMQzmB3S5xee+9GzplZVkg4DwxrAIvr299XNaGL0GI/zLsdnxqXPws5f xgBMsvTE7uf6WtC0PsBSt+MDoJxsNQDJdUR6t0Xq+tfUnfXZTo0VUPcYTJhk5HB8wd9BUZvJKdY tryIhGJ5CazpPYXfd6GRyW3AyWCP2vd/zG2a2atbjyI23Z0QuOgcYGC6HpgiOjHoC0tE64hDqOt +dghGQ86e9Ig8ElgXVks3nWhcdotOAjdItn8XAlom3xO4+qeSHRM9bWTdI/FngFAefmmmpxA0Uj bkXkE5f/aTGtYu0NkTQURmTFGTkA/pT46+ovHPa1QGTL70va6QJETF617ecg0Sa0oHD8l9QskdG YOrP19y+/6Tr1cYrAGrrJRw3ixBrjnGO2kQGmCfxqcmztvW1PomXZD1lNy2yhSA54JpA4dXHf8I LrvQ4rA646UebVWpB/p8xbg== 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-20260813_135203_734118_C9796B5F X-CRM114-Status: GOOD ( 14.92 ) 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. Tested-by: Igor Paunovic # Orange Pi 5 Plus 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 0399cbf96e19..8c165bcab796 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 @@ -650,14 +651,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) @@ -667,8 +669,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; } @@ -1020,26 +1020,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; } @@ -1047,10 +1046,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; } @@ -1255,35 +1254,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; } @@ -1315,12 +1309,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