Commit 6ae6942f authored by Cai Huoqing's avatar Cai Huoqing Committed by Vinod Koul
Browse files

phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset() 



The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and gif devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.

Signed-off-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210922130017.692-1-caihuoqing@baidu.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 55b9b741

drivers/phy/qualcomm/phy-qcom-qmp.c

+2 −10
Original line number Diff line number Diff line
@@ -5154,11 +5154,7 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np) 
	 * Roll a devm action because the clock provider is the child node, but

	 * the child node is not actually a device.

	 */

	ret = devm_add_action(qmp->dev, phy_clk_release_provider, np);

	if (ret)

		phy_clk_release_provider(np);



	return ret;

	return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);

}



/*
@@ -5350,11 +5346,7 @@ static int phy_dp_clks_register(struct qcom_qmp *qmp, struct qmp_phy *qphy, 
	 * Roll a devm action because the clock provider is the child node, but

	 * the child node is not actually a device.

	 */

	ret = devm_add_action(qmp->dev, phy_clk_release_provider, np);

	if (ret)

		phy_clk_release_provider(np);



	return ret;

	return devm_add_action_or_reset(qmp->dev, phy_clk_release_provider, np);

}



static const struct phy_ops qcom_qmp_phy_gen_ops = {