coresight: Change name of pdata->conns

conns is actually for output connections. Change the name to make it
clearer and so that we can add input connections later.

No functional changes.

Reviewed-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: James Clark <james.clark@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20230425143542.2305069-4-james.clark@arm.com

diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c
index c891078dffc69d641c68facac47e21c2d88391d2..04c9d52f8f4f35cb80201a9a80b8c03598b93de2 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-core.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -119,7 +119,7 @@ static int coresight_find_link_inport(struct coresight_device *csdev,
        struct coresight_connection *conn;
 
        for (i = 0; i < parent->pdata->nr_outport; i++) {
-               conn = &parent->pdata->conns[i];
+               conn = &parent->pdata->out_conns[i];
                if (conn->child_dev == csdev)
                        return conn->child_port;
        }
@@ -137,7 +137,7 @@ static int coresight_find_link_outport(struct coresight_device *csdev,
        struct coresight_connection *conn;
 
        for (i = 0; i < csdev->pdata->nr_outport; i++) {
-               conn = &csdev->pdata->conns[i];
+               conn = &csdev->pdata->out_conns[i];
                if (conn->child_dev == child)
                        return conn->outport;
        }
@@ -606,7 +606,7 @@ coresight_find_enabled_sink(struct coresight_device *csdev)
        for (i = 0; i < csdev->pdata->nr_outport; i++) {
                struct coresight_device *child_dev;
 
-               child_dev = csdev->pdata->conns[i].child_dev;
+               child_dev = csdev->pdata->out_conns[i].child_dev;
                if (child_dev)
                        sink = coresight_find_enabled_sink(child_dev);
                if (sink)
@@ -722,7 +722,7 @@ static int coresight_grab_device(struct coresight_device *csdev)
        for (i = 0; i < csdev->pdata->nr_outport; i++) {
                struct coresight_device *child;
 
-               child  = csdev->pdata->conns[i].child_dev;
+               child = csdev->pdata->out_conns[i].child_dev;
                if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
                        if (!coresight_get_ref(child))
                                goto err;
@@ -733,7 +733,7 @@ err:
        for (i--; i >= 0; i--) {
                struct coresight_device *child;
 
-               child  = csdev->pdata->conns[i].child_dev;
+               child = csdev->pdata->out_conns[i].child_dev;
                if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
                        coresight_put_ref(child);
        }
@@ -752,7 +752,7 @@ static void coresight_drop_device(struct coresight_device *csdev)
        for (i = 0; i < csdev->pdata->nr_outport; i++) {
                struct coresight_device *child;
 
-               child  = csdev->pdata->conns[i].child_dev;
+               child = csdev->pdata->out_conns[i].child_dev;
                if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
                        coresight_put_ref(child);
        }
@@ -794,7 +794,7 @@ static int _coresight_build_path(struct coresight_device *csdev,
        for (i = 0; i < csdev->pdata->nr_outport; i++) {
                struct coresight_device *child_dev;
 
-               child_dev = csdev->pdata->conns[i].child_dev;
+               child_dev = csdev->pdata->out_conns[i].child_dev;
                if (child_dev &&
                    _coresight_build_path(child_dev, sink, path) == 0) {
                        found = true;
@@ -964,7 +964,7 @@ coresight_find_sink(struct coresight_device *csdev, int *depth)
                struct coresight_device *child_dev, *sink = NULL;
                int child_depth = curr_depth;
 
-               child_dev = csdev->pdata->conns[i].child_dev;
+               child_dev = csdev->pdata->out_conns[i].child_dev;
                if (child_dev)
                        sink = coresight_find_sink(child_dev, &child_depth);
 
@@ -1334,7 +1334,7 @@ static int coresight_orphan_match(struct device *dev, void *data)
         * an orphan connection whose name matches @csdev, link it.
         */
        for (i = 0; i < i_csdev->pdata->nr_outport; i++) {
-               conn = &i_csdev->pdata->conns[i];
+               conn = &i_csdev->pdata->out_conns[i];
 
                /* Skip the port if FW doesn't describe it */
                if (!conn->child_fwnode)
@@ -1375,7 +1375,7 @@ static int coresight_fixup_device_conns(struct coresight_device *csdev)
        int i, ret = 0;
 
        for (i = 0; i < csdev->pdata->nr_outport; i++) {
-               struct coresight_connection *conn = &csdev->pdata->conns[i];
+               struct coresight_connection *conn = &csdev->pdata->out_conns[i];
 
                if (!conn->child_fwnode)
                        continue;
@@ -1412,7 +1412,7 @@ static int coresight_remove_match(struct device *dev, void *data)
         * a connection whose name matches @csdev, remove it.
         */
        for (i = 0; i < iterator->pdata->nr_outport; i++) {
-               conn = &iterator->pdata->conns[i];
+               conn = &iterator->pdata->out_conns[i];
 
                if (conn->child_dev == NULL || conn->child_fwnode == NULL)
                        continue;
@@ -1543,7 +1543,7 @@ void coresight_release_platform_data(struct coresight_device *csdev,
                                     struct coresight_platform_data *pdata)
 {
        int i;
-       struct coresight_connection *conns = pdata->conns;
+       struct coresight_connection *conns = pdata->out_conns;
 
        for (i = 0; i < pdata->nr_outport; i++) {
                /* If we have made the links, remove them now */
@@ -1555,7 +1555,7 @@ void coresight_release_platform_data(struct coresight_device *csdev,
                 */
                if (conns[i].child_fwnode) {
                        fwnode_handle_put(conns[i].child_fwnode);
-                       pdata->conns[i].child_fwnode = NULL;
+                       conns[i].child_fwnode = NULL;
                }
        }
        if (csdev)

diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
index 47589971410467a64c16100bfddce51e997cf01f..5085525a32bb3869b12edc0dbdc22e46146c558b 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-platform.c
+++ b/drivers/hwtracing/coresight/coresight-platform.c
@@ -27,9 +27,9 @@ static int coresight_alloc_conns(struct device *dev,
                                 struct coresight_platform_data *pdata)
 {
        if (pdata->nr_outport) {
-               pdata->conns = devm_kcalloc(dev, pdata->nr_outport,
-                                           sizeof(*pdata->conns), GFP_KERNEL);
-               if (!pdata->conns)
+               pdata->out_conns = devm_kcalloc(dev, pdata->nr_outport,
+                                           sizeof(*pdata->out_conns), GFP_KERNEL);
+               if (!pdata->out_conns)
                        return -ENOMEM;
        }
 
@@ -251,7 +251,7 @@ static int of_coresight_parse_endpoint(struct device *dev,
                        break;
                }
 
-               conn = &pdata->conns[endpoint.port];
+               conn = &pdata->out_conns[endpoint.port];
                if (conn->child_fwnode) {
                        dev_warn(dev, "Duplicate output port %d\n",
                                 endpoint.port);
@@ -744,8 +744,8 @@ static int acpi_coresight_parse_graph(struct acpi_device *adev,
                int port = conns[i].outport;
 
                /* Duplicate output port */
-               WARN_ON(pdata->conns[port].child_fwnode);
-               pdata->conns[port] = conns[i];
+               WARN_ON(pdata->out_conns[port].child_fwnode);
+               pdata->out_conns[port] = conns[i];
        }
 
        devm_kfree(&adev->dev, conns);

diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index 9aa71b18731d2c44bfaf28b09006ab41c4942a23..a16f32d80ae2fa97752fce92ff42fb122bc7ab83 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -782,7 +782,7 @@ tmc_etr_get_catu_device(struct tmc_drvdata *drvdata)
                return NULL;
 
        for (i = 0; i < etr->pdata->nr_outport; i++) {
-               tmp = etr->pdata->conns[i].child_dev;
+               tmp = etr->pdata->out_conns[i].child_dev;
                if (tmp && coresight_is_catu_device(tmp))
                        return tmp;
        }

diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 1f878e8ed8c45b28186b38f7fda66c8a380ddda2..bf621d064ef80cd80f4ccf43d350eaec0d531785 100644 (file)
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -104,12 +104,12 @@ union coresight_dev_subtype {
  *
  * @nr_inport: Number of elements for the input connections.
  * @nr_outport:        Number of elements for the output connections.
- * @conns:     Sparse array of nr_outport connections from this component.
+ * @out_conns: Sparse array of nr_outport connections from this component.
  */
 struct coresight_platform_data {
        int nr_inport;
        int nr_outport;
-       struct coresight_connection *conns;
+       struct coresight_connection *out_conns;
 };
 
 /**