net/mlx5e: Rename reporter's helpers

Change prefix to match resident file:
%s/mlx5e_reporter_cq_diagnose/mlx5e_health_cq_diag_fmsg
%s/mlx5e_reporter_cq_common_diagnose/mlx5e_health_cq_common_diag_fmsg
%s/mlx5e_reporter_named_obj_nest_start/mlx5e_health_fmsg_named_obj_nest_start
%s/mlx5e_reporter_named_obj_nest_end/mlx5e_health_fmsg_named_obj_nest_end

Signed-off-by: Aya Levin <ayal@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c
index d0625ee923d6dad5fedd7eff8dabee9606ccac8f..1b735b54b3abaca278889520dffc59f174245a5c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.c
@@ -5,7 +5,7 @@
 #include "lib/eq.h"
 #include "lib/mlx5.h"
 
-int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name)
+int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name)
 {
        int err;
 
@@ -20,7 +20,7 @@ int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name)
        return 0;
 }
 
-int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg)
+int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg)
 {
        int err;
 
@@ -35,7 +35,7 @@ int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg)
        return 0;
 }
 
-int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)
+int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)
 {
        struct mlx5e_priv *priv = cq->channel->priv;
        u32 out[MLX5_ST_SZ_DW(query_cq_out)] = {};
@@ -50,7 +50,7 @@ int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)
        cqc = MLX5_ADDR_OF(query_cq_out, out, cq_context);
        hw_status = MLX5_GET(cqc, cqc, status);
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "CQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ");
        if (err)
                return err;
 
@@ -62,14 +62,14 @@ int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
        return 0;
 }
 
-int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)
+int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg)
 {
        u8 cq_log_stride;
        u32 cq_sz;
@@ -78,7 +78,7 @@ int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *
        cq_sz = mlx5_cqwq_get_size(&cq->wq);
        cq_log_stride = mlx5_cqwq_get_log_stride_size(&cq->wq);
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "CQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "CQ");
        if (err)
                return err;
 
@@ -90,7 +90,7 @@ int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
@@ -282,7 +282,7 @@ int mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, lbl);
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, lbl);
        if (err)
                return err;
 
@@ -294,7 +294,7 @@ int mlx5e_health_queue_dump(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h
index 2938553a7606bb2ab2b6742285c27740cd628da3..6e48518d3d5b83780fda00be4f9a5d940e95e8da 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/health.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/health.h
@@ -21,10 +21,10 @@ void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv);
 void mlx5e_reporter_tx_err_cqe(struct mlx5e_txqsq *sq);
 int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq);
 
-int mlx5e_reporter_cq_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);
-int mlx5e_reporter_cq_common_diagnose(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);
-int mlx5e_reporter_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name);
-int mlx5e_reporter_named_obj_nest_end(struct devlink_fmsg *fmsg);
+int mlx5e_health_cq_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);
+int mlx5e_health_cq_common_diag_fmsg(struct mlx5e_cq *cq, struct devlink_fmsg *fmsg);
+int mlx5e_health_fmsg_named_obj_nest_start(struct devlink_fmsg *fmsg, char *name);
+int mlx5e_health_fmsg_named_obj_nest_end(struct devlink_fmsg *fmsg);
 
 void mlx5e_reporter_rx_create(struct mlx5e_priv *priv);
 void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index bec804295c52e87bfb908854b2cd1cd76b3bb520..4e1a01d871b7b73af18a573c171d71712b44bf82 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -238,7 +238,7 @@ static int mlx5e_rx_reporter_build_diagnose_output(struct mlx5e_rq *rq,
        if (err)
                return err;
 
-       err = mlx5e_reporter_cq_diagnose(&rq->cq, fmsg);
+       err = mlx5e_health_cq_diag_fmsg(&rq->cq, fmsg);
        if (err)
                return err;
 
@@ -268,11 +268,11 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,
        rq_sz = mlx5e_rqwq_get_size(generic_rq);
        rq_stride = BIT(mlx5e_mpwqe_get_log_stride_size(priv->mdev, params, NULL));
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "Common config");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "Common config");
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "RQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RQ");
        if (err)
                goto unlock;
 
@@ -288,15 +288,15 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_cq_common_diagnose(&generic_rq->cq, fmsg);
+       err = mlx5e_health_cq_common_diag_fmsg(&generic_rq->cq, fmsg);
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                goto unlock;
 
@@ -329,7 +329,7 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return 0;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "SX Slice");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SX Slice");
        if (err)
                return err;
 
@@ -339,15 +339,15 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "ICOSQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "ICOSQ");
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "QPC");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "QPC");
        if (err)
                return err;
 
@@ -359,11 +359,11 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "send_buff");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "send_buff");
        if (err)
                return err;
 
@@ -374,11 +374,11 @@ static int mlx5e_rx_reporter_dump_icosq(struct mlx5e_priv *priv, struct devlink_
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       return mlx5e_reporter_named_obj_nest_end(fmsg);
+       return mlx5e_health_fmsg_named_obj_nest_end(fmsg);
 }
 
 static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fmsg *fmsg,
@@ -391,7 +391,7 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return 0;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "RX Slice");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RX Slice");
        if (err)
                return err;
 
@@ -401,15 +401,15 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "RQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RQ");
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "QPC");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "QPC");
        if (err)
                return err;
 
@@ -421,11 +421,11 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "receive_buff");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "receive_buff");
        if (err)
                return err;
 
@@ -435,11 +435,11 @@ static int mlx5e_rx_reporter_dump_rq(struct mlx5e_priv *priv, struct devlink_fms
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       return mlx5e_reporter_named_obj_nest_end(fmsg);
+       return mlx5e_health_fmsg_named_obj_nest_end(fmsg);
 }
 
 static int mlx5e_rx_reporter_dump_all_rqs(struct mlx5e_priv *priv,
@@ -451,7 +451,7 @@ static int mlx5e_rx_reporter_dump_all_rqs(struct mlx5e_priv *priv,
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return 0;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "RX Slice");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "RX Slice");
        if (err)
                return err;
 
@@ -461,7 +461,7 @@ static int mlx5e_rx_reporter_dump_all_rqs(struct mlx5e_priv *priv,
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index 6eb2971231d8de7643fb637da18e4ea62fc02483..9f712ff2faf9eedabb08d411b49cbbdc37730edb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -166,7 +166,7 @@ mlx5e_tx_reporter_build_diagnose_output(struct devlink_fmsg *fmsg,
        if (err)
                return err;
 
-       err = mlx5e_reporter_cq_diagnose(&sq->cq, fmsg);
+       err = mlx5e_health_cq_diag_fmsg(&sq->cq, fmsg);
        if (err)
                return err;
 
@@ -195,11 +195,11 @@ static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,
        sq_sz = mlx5_wq_cyc_get_size(&generic_sq->wq);
        sq_stride = MLX5_SEND_WQE_BB;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "Common Config");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "Common Config");
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "SQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SQ");
        if (err)
                goto unlock;
 
@@ -211,15 +211,15 @@ static int mlx5e_tx_reporter_diagnose(struct devlink_health_reporter *reporter,
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_cq_common_diagnose(&generic_sq->cq, fmsg);
+       err = mlx5e_health_cq_common_diag_fmsg(&generic_sq->cq, fmsg);
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                goto unlock;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                goto unlock;
 
@@ -257,7 +257,7 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return 0;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "SX Slice");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SX Slice");
        if (err)
                return err;
 
@@ -267,15 +267,15 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "SQ");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SQ");
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "QPC");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "QPC");
        if (err)
                return err;
 
@@ -287,11 +287,11 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "send_buff");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "send_buff");
        if (err)
                return err;
 
@@ -301,11 +301,11 @@ static int mlx5e_tx_reporter_dump_sq(struct mlx5e_priv *priv, struct devlink_fms
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;
 
-       return mlx5e_reporter_named_obj_nest_end(fmsg);
+       return mlx5e_health_fmsg_named_obj_nest_end(fmsg);
 }
 
 static int mlx5e_tx_reporter_dump_all_sqs(struct mlx5e_priv *priv,
@@ -317,7 +317,7 @@ static int mlx5e_tx_reporter_dump_all_sqs(struct mlx5e_priv *priv,
        if (!test_bit(MLX5E_STATE_OPENED, &priv->state))
                return 0;
 
-       err = mlx5e_reporter_named_obj_nest_start(fmsg, "SX Slice");
+       err = mlx5e_health_fmsg_named_obj_nest_start(fmsg, "SX Slice");
        if (err)
                return err;
 
@@ -327,7 +327,7 @@ static int mlx5e_tx_reporter_dump_all_sqs(struct mlx5e_priv *priv,
        if (err)
                return err;
 
-       err = mlx5e_reporter_named_obj_nest_end(fmsg);
+       err = mlx5e_health_fmsg_named_obj_nest_end(fmsg);
        if (err)
                return err;