* [PATCH] phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset()
@ 2021-09-22 13:00 Cai Huoqing
2021-09-22 15:57 ` Bjorn Andersson
2021-10-01 10:21 ` Vinod Koul
0 siblings, 2 replies; 3+ messages in thread
From: Cai Huoqing @ 2021-09-22 13:00 UTC (permalink / raw)
To: caihuoqing
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I, Vinod Koul,
linux-arm-msm, linux-phy, linux-kernel
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: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/phy/qualcomm/phy-qcom-qmp.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index f14032170b1c..084e3d96264e 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -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 = {
--
2.25.1
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset()
2021-09-22 13:00 [PATCH] phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
@ 2021-09-22 15:57 ` Bjorn Andersson
2021-10-01 10:21 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2021-09-22 15:57 UTC (permalink / raw)
To: Cai Huoqing
Cc: Andy Gross, Kishon Vijay Abraham I, Vinod Koul, linux-arm-msm,
linux-phy, linux-kernel
On Wed 22 Sep 06:00 PDT 2021, Cai Huoqing wrote:
> 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.
>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp.c | 12 ++----------
> 1 file changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index f14032170b1c..084e3d96264e 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -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 = {
> --
> 2.25.1
>
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset()
2021-09-22 13:00 [PATCH] phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-22 15:57 ` Bjorn Andersson
@ 2021-10-01 10:21 ` Vinod Koul
1 sibling, 0 replies; 3+ messages in thread
From: Vinod Koul @ 2021-10-01 10:21 UTC (permalink / raw)
To: Cai Huoqing
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
linux-arm-msm, linux-phy, linux-kernel
On 22-09-21, 21:00, Cai Huoqing wrote:
> 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.
Applied, thanks
--
~Vinod
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-01 10:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-22 13:00 [PATCH] phy: qcom-qmp: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-22 15:57 ` Bjorn Andersson
2021-10-01 10:21 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).