diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2026-08-11 18:44:48 +0300 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2026-08-11 22:24:02 +0530 |
| commit | e49e4bc9f90eeb6b672762c6f089e2fafec104c4 (patch) | |
| tree | 27e1d6e40907cd8c6f3960171da1e45757e57be5 | |
| parent | c2dd42e3ebd76f24bdc21eafe17149bec2ce1394 (diff) | |
| download | linux-stable-e49e4bc9f90eeb6b672762c6f089e2fafec104c4.tar.gz linux-stable-e49e4bc9f90eeb6b672762c6f089e2fafec104c4.zip | |
phy: rockchip: samsung-hdptx: Consolidate consumer_put on error path
rk_hdptx_phy_consumer_put() is invoked in both branches of the mode
check conditional in rk_hdptx_phy_power_on() on the error path.
Simplify the code by moving the single call to the end of the
function.
No functional change intended.
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@oss.qualcomm.com>
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Link: https://patch.msgid.link/20260811-hdptx-clk-fixes-v6-7-75bca0ee5753@collabora.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
| -rw-r--r-- | drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c index 6941dac9deb4..294484da7085 100644 --- a/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c +++ b/drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c @@ -1685,8 +1685,6 @@ static int rk_hdptx_phy_power_on(struct phy *phy) rk_hdptx_dp_pll_init(hdptx); ret = rk_hdptx_dp_aux_init(hdptx); - if (ret) - rk_hdptx_phy_consumer_put(hdptx, true); } else { dev_dbg(hdptx->dev, "%s rate=%llu bpc=%u\n", __func__, hdptx->hdmi_cfg.rate, hdptx->hdmi_cfg.bpc); @@ -1703,11 +1701,11 @@ static int rk_hdptx_phy_power_on(struct phy *phy) else ret = rk_hdptx_tmds_ropll_mode_config(hdptx); } - - if (ret) - rk_hdptx_phy_consumer_put(hdptx, true); } + if (ret) + rk_hdptx_phy_consumer_put(hdptx, true); + return ret; } |
