UPSTREAM: phy: rockchip-usb: move per-phy init into a separate function

This unclutters the loop in probe a lot and makes current (and future)
error handling easier to read.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
(cherry picked from commit 97dd9101091bb13b1ca3fe42edacf2bd7cf10924)

Change-Id: I5c2ccfbd42e52b77649f01bca2a86767f27fe32f

diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c
index 2b4802a7497d88c6cdb2549999c7f6fb4e0b152a..ff3ac3379c6111b88124574a0f7764e40a8463fb 100644 (file)
--- a/drivers/phy/phy-rockchip-usb.c
+++ b/drivers/phy/phy-rockchip-usb.c
@@ -103,14 +103,52 @@ static void rockchip_usb_phy_action(void *data)
                clk_put(rk_phy->clk);
 }
 
+static int rockchip_usb_phy_init(struct rockchip_usb_phy_base *base,
+                                struct device_node *child)
+{
+       struct rockchip_usb_phy *rk_phy;
+       unsigned int reg_offset;
+       int err;
+
+       rk_phy = devm_kzalloc(base->dev, sizeof(*rk_phy), GFP_KERNEL);
+       if (!rk_phy)
+               return -ENOMEM;
+
+       rk_phy->base = base;
+
+       if (of_property_read_u32(child, "reg", &reg_offset)) {
+               dev_err(base->dev, "missing reg property in node %s\n",
+                       child->name);
+               return -EINVAL;
+       }
+
+       rk_phy->reg_offset = reg_offset;
+
+       err = devm_add_action(base->dev, rockchip_usb_phy_action, rk_phy);
+       if (err)
+               return err;
+
+       rk_phy->clk = of_clk_get_by_name(child, "phyclk");
+       if (IS_ERR(rk_phy->clk))
+               rk_phy->clk = NULL;
+
+       rk_phy->phy = devm_phy_create(base->dev, child, &ops);
+       if (IS_ERR(rk_phy->phy)) {
+               dev_err(base->dev, "failed to create PHY\n");
+               return PTR_ERR(rk_phy->phy);
+       }
+       phy_set_drvdata(rk_phy->phy, rk_phy);
+
+       /* only power up usb phy when it use, so disable it when init*/
+       return rockchip_usb_phy_power(rk_phy, 1);
+}
+
 static int rockchip_usb_phy_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct rockchip_usb_phy_base *phy_base;
-       struct rockchip_usb_phy *rk_phy;
        struct phy_provider *phy_provider;
        struct device_node *child;
-       unsigned int reg_offset;
        int err;
 
        phy_base = devm_kzalloc(dev, sizeof(*phy_base), GFP_KERNEL);
@@ -126,50 +164,15 @@ static int rockchip_usb_phy_probe(struct platform_device *pdev)
        }
 
        for_each_available_child_of_node(dev->of_node, child) {
-               rk_phy = devm_kzalloc(dev, sizeof(*rk_phy), GFP_KERNEL);
-               if (!rk_phy) {
-                       err = -ENOMEM;
-                       goto put_child;
-               }
-
-               rk_phy->base = phy_base;
-
-               if (of_property_read_u32(child, "reg", &reg_offset)) {
-                       dev_err(dev, "missing reg property in node %s\n",
-                               child->name);
-                       err = -EINVAL;
-                       goto put_child;
-               }
-
-               rk_phy->reg_offset = reg_offset;
-
-               err = devm_add_action(dev, rockchip_usb_phy_action, rk_phy);
-               if (err)
+               err = rockchip_usb_phy_init(phy_base, child);
+               if (err) {
+                       of_node_put(child);
                        return err;
-
-               rk_phy->clk = of_clk_get_by_name(child, "phyclk");
-               if (IS_ERR(rk_phy->clk))
-                       rk_phy->clk = NULL;
-
-               rk_phy->phy = devm_phy_create(dev, child, &ops);
-               if (IS_ERR(rk_phy->phy)) {
-                       dev_err(dev, "failed to create PHY\n");
-                       err = PTR_ERR(rk_phy->phy);
-                       goto put_child;
                }
-               phy_set_drvdata(rk_phy->phy, rk_phy);
-
-               /* only power up usb phy when it use, so disable it when init*/
-               err = rockchip_usb_phy_power(rk_phy, 1);
-               if (err)
-                       goto put_child;
        }
 
        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
        return PTR_ERR_OR_ZERO(phy_provider);
-put_child:
-       of_node_put(child);
-       return err;
 }
 
 static const struct of_device_id rockchip_usb_phy_dt_ids[] = {