Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / drivers / phy / rockchip / phy-rockchip-inno-usb2.c

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 4f569d9..1938365 100644 (file)
--- 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: