Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / drivers / hwtracing / coresight / of_coresight.c

diff --git a/drivers/hwtracing/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c
index f3cc8e97a0f8e65ef7b7d4b3526661990c280dad..35e51ce93a5c6af546dcc655a63870b0a7326b81 100644 (file)
--- a/drivers/hwtracing/coresight/of_coresight.c
+++ b/drivers/hwtracing/coresight/of_coresight.c
@@ -53,15 +53,6 @@ of_coresight_get_endpoint_device(struct device_node *endpoint)
                               endpoint, of_dev_node_match);
 }
 
-static struct device_node *of_get_coresight_endpoint(
-               const struct device_node *parent, struct device_node *prev)
-{
-       struct device_node *node = of_graph_get_next_endpoint(parent, prev);
-
-       of_node_put(prev);
-       return node;
-}
-
 static void of_coresight_get_ports(struct device_node *node,
                                   int *nr_inport, int *nr_outport)
 {
@@ -69,7 +60,7 @@ static void of_coresight_get_ports(struct device_node *node,
        int in = 0, out = 0;
 
        do {
-               ep = of_get_coresight_endpoint(node, ep);
+               ep = of_graph_get_next_endpoint(node, ep);
                if (!ep)
                        break;
 
@@ -141,7 +132,7 @@ struct coresight_platform_data *of_get_coresight_platform_data(
                /* Iterate through each port to discover topology */
                do {
                        /* Get a handle on a port */
-                       ep = of_get_coresight_endpoint(node, ep);
+                       ep = of_graph_get_next_endpoint(node, ep);
                        if (!ep)
                                break;