From: Vladyslav Tarasiuk <vladysl...@mellanox.com>

Utilize new devlink-health port reporters API to move rx and tx
reporters from device to port.

Signed-off-by: Vladyslav Tarasiuk <vladysl...@mellanox.com>
Reviewed-by: Moshe Shemesh <mo...@mellanox.com>
Reviewed-by: Jiri Pirko <j...@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c |  9 +++------
 drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c | 13 ++++---------
 2 files changed, 7 insertions(+), 15 deletions(-)

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 c209579..35df79d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -565,13 +565,10 @@ void mlx5e_reporter_icosq_cqe_err(struct mlx5e_icosq 
*icosq)
 
 int mlx5e_reporter_rx_create(struct mlx5e_priv *priv)
 {
-       struct devlink *devlink = priv_to_devlink(priv->mdev);
        struct devlink_health_reporter *reporter;
 
-       reporter = devlink_health_reporter_create(devlink,
-                                                 &mlx5_rx_reporter_ops,
-                                                 
MLX5E_REPORTER_RX_GRACEFUL_PERIOD,
-                                                 priv);
+       reporter = devlink_port_health_reporter_create(&priv->dl_port, 
&mlx5_rx_reporter_ops,
+                                                      
MLX5E_REPORTER_RX_GRACEFUL_PERIOD, priv);
        if (IS_ERR(reporter)) {
                netdev_warn(priv->netdev, "Failed to create rx reporter, err = 
%ld\n",
                            PTR_ERR(reporter));
@@ -586,5 +583,5 @@ void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv)
        if (!priv->rx_reporter)
                return;
 
-       devlink_health_reporter_destroy(priv->rx_reporter);
+       devlink_port_health_reporter_destroy(priv->rx_reporter);
 }
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 9805fc0..917aef9 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -409,14 +409,9 @@ int mlx5e_reporter_tx_timeout(struct mlx5e_txqsq *sq)
 int mlx5e_reporter_tx_create(struct mlx5e_priv *priv)
 {
        struct devlink_health_reporter *reporter;
-       struct mlx5_core_dev *mdev = priv->mdev;
-       struct devlink *devlink;
-
-       devlink = priv_to_devlink(mdev);
-       reporter =
-               devlink_health_reporter_create(devlink, &mlx5_tx_reporter_ops,
-                                              MLX5_REPORTER_TX_GRACEFUL_PERIOD,
-                                              priv);
+
+       reporter = devlink_port_health_reporter_create(&priv->dl_port, 
&mlx5_tx_reporter_ops,
+                                                      
MLX5_REPORTER_TX_GRACEFUL_PERIOD, priv);
        if (IS_ERR(reporter)) {
                netdev_warn(priv->netdev,
                            "Failed to create tx reporter, err = %ld\n",
@@ -432,5 +427,5 @@ void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv)
        if (!priv->tx_reporter)
                return;
 
-       devlink_health_reporter_destroy(priv->tx_reporter);
+       devlink_port_health_reporter_destroy(priv->tx_reporter);
 }
-- 
1.8.3.1

Reply via email to