Commit 717e04fb authored by Cai Huoqing's avatar Cai Huoqing Committed by Vinod Koul

phy: rockchip-inno-usb2: 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>
Link: https://lore.kernel.org/r/20210922130024.745-1-caihuoqing@baidu.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 6ae6942f
...@@ -321,7 +321,7 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy) ...@@ -321,7 +321,7 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
struct device_node *node = rphy->dev->of_node; struct device_node *node = rphy->dev->of_node;
struct clk_init_data init; struct clk_init_data init;
const char *clk_name; const char *clk_name;
int ret; int ret = 0;
init.flags = 0; init.flags = 0;
init.name = "clk_usbphy_480m"; init.name = "clk_usbphy_480m";
...@@ -352,15 +352,8 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy) ...@@ -352,15 +352,8 @@ rockchip_usb2phy_clk480m_register(struct rockchip_usb2phy *rphy)
if (ret < 0) if (ret < 0)
goto err_clk_provider; goto err_clk_provider;
ret = devm_add_action(rphy->dev, rockchip_usb2phy_clk480m_unregister, return devm_add_action_or_reset(rphy->dev, rockchip_usb2phy_clk480m_unregister, rphy);
rphy);
if (ret < 0)
goto err_unreg_action;
return 0;
err_unreg_action:
of_clk_del_provider(node);
err_clk_provider: err_clk_provider:
clk_unregister(rphy->clk480m); clk_unregister(rphy->clk480m);
err_ret: err_ret:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment