coresight: refactor with function of_coresight_get_cpu

This is refactor to add function of_coresight_get_cpu(), so it's used to
retrieve CPU id for coresight component. Finally can use it as a common
function for multiple places.

Suggested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
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>

1 files changed, 28 insertions, 15 deletions

diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index 225b2dd5970c..a18794128bf8 100644
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -101,16 +101,40 @@ static int of_coresight_alloc_memory(struct device *dev,
         return 0;
 }
 
+int of_coresight_get_cpu(const struct device_node *node)
+{
+        int cpu;
+        bool found;
+        struct device_node *dn, *np;
+
+        dn = of_parse_phandle(node, "cpu", 0);
+
+        /* Affinity defaults to CPU0 */
+        if (!dn)
+                return 0;
+
+        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 */
+        return found ? cpu : 0;
+}
+EXPORT_SYMBOL_GPL(of_coresight_get_cpu);
+
 struct coresight_platform_data *
 of_get_coresight_platform_data(struct device *dev,
                                const struct device_node *node)
 {
-        int i = 0, ret = 0, cpu;
+        int i = 0, ret = 0;
         struct coresight_platform_data *pdata;
         struct of_endpoint endpoint, rendpoint;
         struct device *rdev;
-        bool found;
-        struct device_node *dn, *np;
         struct device_node *ep = NULL;
         struct device_node *rparent = NULL;
         struct device_node *rport = NULL;
@@ -177,18 +201,7 @@ of_get_coresight_platform_data(struct device *dev,
                 } while (ep);
         }
 
-        dn = of_parse_phandle(node, "cpu", 0);
-        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;
+        pdata->cpu = of_coresight_get_cpu(node);
 
         return pdata;
 }