* [PATCH] phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset()
@ 2021-09-22 13:00 Cai Huoqing
2021-10-01 10:24 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Cai Huoqing @ 2021-09-22 13:00 UTC (permalink / raw)
To: caihuoqing
Cc: Kishon Vijay Abraham I, Vinod Koul, Heiko Stuebner, linux-phy,
linux-arm-kernel, linux-rockchip, 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/rockchip/phy-rockchip-inno-usb2.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 4f569d9307b9..1938365abbb3 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -321,7 +321,7 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
struct device_node *node = rphy->dev->of_node;
struct clk_init_data init;
const char *clk_name;
- int ret;
+ int ret = 0;
init.flags = 0;
init.name = "clk_usbphy_480m";
@@ -352,15 +352,8 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
if (ret < 0)
goto err_clk_provider;
- ret = devm_add_action(rphy->dev, rockchip_usb2phy_clk480m_unregister,
- rphy);
- if (ret < 0)
- goto err_unreg_action;
-
- return 0;
+ return devm_add_action_or_reset(rphy->dev, rockchip_usb2phy_clk480m_unregister, rphy);
-err_unreg_action:
- of_clk_del_provider(node);
err_clk_provider:
clk_unregister(rphy->clk480m);
err_ret:
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset()
2021-09-22 13:00 [PATCH] phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
@ 2021-10-01 10:24 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2021-10-01 10:24 UTC (permalink / raw)
To: Cai Huoqing
Cc: Kishon Vijay Abraham I, Heiko Stuebner, linux-phy,
linux-arm-kernel, linux-rockchip, 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-01 10:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 13:00 [PATCH] phy: rockchip-inno-usb2: Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-10-01 10:24 ` 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).