devlink: remove devl*_port_health_reporter_destroy()

Remove port-specific health reporter destroy function as it is
currently the same as the instance one so no longer needed. Inline
__devlink_health_reporter_destroy() as it is no longer called from
multiple places.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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 1ae15b8536a8576a793a1bc148f5f9377dcdda66..95edab4a1732be69662ee36e8b13573ee27a97a1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -754,6 +754,6 @@ void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv)
        if (!priv->rx_reporter)
                return;
 
-       devlink_port_health_reporter_destroy(priv->rx_reporter);
+       devlink_health_reporter_destroy(priv->rx_reporter);
        priv->rx_reporter = NULL;
 }

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 60bc5b577ab993099598dfda40fa5b4696212081..b195dbbf6c90feba91b73b1d0935ceb70f897a3c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -609,6 +609,6 @@ void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv)
        if (!priv->tx_reporter)
                return;
 
-       devlink_port_health_reporter_destroy(priv->tx_reporter);
+       devlink_health_reporter_destroy(priv->tx_reporter);
        priv->tx_reporter = NULL;
 }

diff --git a/include/net/devlink.h b/include/net/devlink.h
index d9ea76bea36e491b9b892918fb8eb1e4ba669da1..608a0c198be82485122c57854331f885068b2434 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -1889,12 +1889,6 @@ devl_health_reporter_destroy(struct devlink_health_reporter *reporter);
 void
 devlink_health_reporter_destroy(struct devlink_health_reporter *reporter);
 
-void
-devl_port_health_reporter_destroy(struct devlink_health_reporter *reporter);
-
-void
-devlink_port_health_reporter_destroy(struct devlink_health_reporter *reporter);
-
 void *
 devlink_health_reporter_priv(struct devlink_health_reporter *reporter);
 int devlink_health_report(struct devlink_health_reporter *reporter,

diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c
index 548e4a379e489f49495ba74479c1ba5a2d8ca0b8..d4e8c285b255e6f696bb3b7e801e2dbe56690b19 100644 (file)
--- a/net/devlink/leftover.c
+++ b/net/devlink/leftover.c
@@ -7442,13 +7442,6 @@ devlink_health_reporter_put(struct devlink_health_reporter *reporter)
                devlink_health_reporter_free(reporter);
 }
 
-static void
-__devlink_health_reporter_destroy(struct devlink_health_reporter *reporter)
-{
-       list_del(&reporter->list);
-       devlink_health_reporter_put(reporter);
-}
-
 /**
  *     devl_health_reporter_destroy - destroy devlink health reporter
  *
@@ -7459,7 +7452,8 @@ devl_health_reporter_destroy(struct devlink_health_reporter *reporter)
 {
        devl_assert_locked(reporter->devlink);
 
-       __devlink_health_reporter_destroy(reporter);
+       list_del(&reporter->list);
+       devlink_health_reporter_put(reporter);
 }
 EXPORT_SYMBOL_GPL(devl_health_reporter_destroy);
 
@@ -7474,31 +7468,6 @@ devlink_health_reporter_destroy(struct devlink_health_reporter *reporter)
 }
 EXPORT_SYMBOL_GPL(devlink_health_reporter_destroy);
 
-/**
- *     devl_port_health_reporter_destroy - destroy devlink port health reporter
- *
- *     @reporter: devlink health reporter to destroy
- */
-void
-devl_port_health_reporter_destroy(struct devlink_health_reporter *reporter)
-{
-       devl_assert_locked(reporter->devlink);
-
-       __devlink_health_reporter_destroy(reporter);
-}
-EXPORT_SYMBOL_GPL(devl_port_health_reporter_destroy);
-
-void
-devlink_port_health_reporter_destroy(struct devlink_health_reporter *reporter)
-{
-       struct devlink *devlink = reporter->devlink;
-
-       devl_lock(devlink);
-       devl_port_health_reporter_destroy(reporter);
-       devl_unlock(devlink);
-}
-EXPORT_SYMBOL_GPL(devlink_port_health_reporter_destroy);
-
 static int
 devlink_nl_health_reporter_fill(struct sk_buff *msg,
                                struct devlink_health_reporter *reporter,