phy: ti: am654-serdes: Use scoped device node handling to simplify error paths

Obtain the device node reference with scoped/cleanup.h to reduce error
handling and make the code a bit simpler.

Unlike in other typical of_node_get+syscon_node_to_regmap cases, the
reference cannot be dropped immediately after syscon_node_to_regmap(),
because further part of probe() uses it.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240826-phy-of-node-scope-v1-8-5b4d82582644@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/ti/phy-am654-serdes.c b/drivers/phy/ti/phy-am654-serdes.c
index 673449607c02cc9b14eba9f1a31aa98a72b339ad..3bf3aff4b1c74610fd26ef9f7d6097baef0ba84f 100644 (file)
--- a/drivers/phy/ti/phy-am654-serdes.c
+++ b/drivers/phy/ti/phy-am654-serdes.c
@@ -7,6 +7,7 @@
  */
 
 #include <dt-bindings/phy/phy.h>
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
@@ -644,7 +645,6 @@ static int serdes_am654_clk_register(struct serdes_am654 *am654_phy,
        struct device_node *node = am654_phy->of_node;
        struct device *dev = am654_phy->dev;
        struct serdes_am654_clk_mux *mux;
-       struct device_node *regmap_node;
        const char **parent_names;
        struct clk_init_data *init;
        unsigned int num_parents;
@@ -652,7 +652,6 @@ static int serdes_am654_clk_register(struct serdes_am654 *am654_phy,
        const __be32 *addr;
        unsigned int reg;
        struct clk *clk;
-       int ret = 0;
 
        mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL);
        if (!mux)
@@ -660,41 +659,30 @@ static int serdes_am654_clk_register(struct serdes_am654 *am654_phy,
 
        init = &mux->clk_data;
 
-       regmap_node = of_parse_phandle(node, "ti,serdes-clk", 0);
-       if (!regmap_node) {
-               dev_err(dev, "Fail to get serdes-clk node\n");
-               ret = -ENODEV;
-               goto out_put_node;
-       }
+       struct device_node *regmap_node __free(device_node) =
+               of_parse_phandle(node, "ti,serdes-clk", 0);
+       if (!regmap_node)
+               return dev_err_probe(dev, -ENODEV, "Fail to get serdes-clk node\n");
 
        regmap = syscon_node_to_regmap(regmap_node->parent);
-       if (IS_ERR(regmap)) {
-               dev_err(dev, "Fail to get Syscon regmap\n");
-               ret = PTR_ERR(regmap);
-               goto out_put_node;
-       }
+       if (IS_ERR(regmap))
+               return dev_err_probe(dev, PTR_ERR(regmap),
+                                    "Fail to get Syscon regmap\n");
 
        num_parents = of_clk_get_parent_count(node);
-       if (num_parents < 2) {
-               dev_err(dev, "SERDES clock must have parents\n");
-               ret = -EINVAL;
-               goto out_put_node;
-       }
+       if (num_parents < 2)
+               return dev_err_probe(dev, -EINVAL, "SERDES clock must have parents\n");
 
        parent_names = devm_kzalloc(dev, (sizeof(char *) * num_parents),
                                    GFP_KERNEL);
-       if (!parent_names) {
-               ret = -ENOMEM;
-               goto out_put_node;
-       }
+       if (!parent_names)
+               return -ENOMEM;
 
        of_clk_parent_fill(node, parent_names, num_parents);
 
        addr = of_get_address(regmap_node, 0, NULL, NULL);
-       if (!addr) {
-               ret = -EINVAL;
-               goto out_put_node;
-       }
+       if (!addr)
+               return -EINVAL;
 
        reg = be32_to_cpu(*addr);
 
@@ -710,16 +698,12 @@ static int serdes_am654_clk_register(struct serdes_am654 *am654_phy,
        mux->hw.init = init;
 
        clk = devm_clk_register(dev, &mux->hw);
-       if (IS_ERR(clk)) {
-               ret = PTR_ERR(clk);
-               goto out_put_node;
-       }
+       if (IS_ERR(clk))
+               return PTR_ERR(clk);
 
        am654_phy->clks[clock_num] = clk;
 
-out_put_node:
-       of_node_put(regmap_node);
-       return ret;
+       return 0;
 }
 
 static const struct of_device_id serdes_am654_id_table[] = {