coresight: of_get_coresight_platform_data: Add missing of_node_put

The of_get_coresight_platform_data iterates over the possible CPU nodes
to find a given cpu phandle. However it does not drop the reference
to the node pointer returned by the of_get_coresight_platform_data.

This patch also introduces another minor fix is to use
of_cpu_device_node_get() to replace of_get_cpu_node().

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
[Leo: minor tweaks for of_get_coresight_platform_data]
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index 2749853b9010e48f3495ab7eb787f38e1a848989..225b2dd5970c7b6ea92c41bd046346f87aead503 100644 (file)
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -109,7 +109,8 @@ of_get_coresight_platform_data(struct device *dev,
        struct coresight_platform_data *pdata;
        struct of_endpoint endpoint, rendpoint;
        struct device *rdev;
-       struct device_node *dn;
+       bool found;
+       struct device_node *dn, *np;
        struct device_node *ep = NULL;
        struct device_node *rparent = NULL;
        struct device_node *rport = NULL;
@@ -176,17 +177,19 @@ of_get_coresight_platform_data(struct device *dev,
                } while (ep);
        }
 
-       /* Affinity defaults to CPU0 */
-       pdata->cpu = 0;
        dn = of_parse_phandle(node, "cpu", 0);
-       for (cpu = 0; dn && cpu < nr_cpu_ids; cpu++) {
-               if (dn == of_get_cpu_node(cpu, NULL)) {
-                       pdata->cpu = cpu;
+       for_each_possible_cpu(cpu) {
+               np = of_cpu_device_node_get(cpu);
+               found = (dn == np);
+               of_node_put(np);
+               if (found)
                        break;
-               }
        }
        of_node_put(dn);
 
+       /* Affinity to CPU0 if no cpu nodes are found */
+       pdata->cpu = found ? cpu : 0;
+
        return pdata;
 }
 EXPORT_SYMBOL_GPL(of_get_coresight_platform_data);