net/mlx5: Remove second FW tracer check

The FW tracer check is called twice, so delete one of them.

Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
index 2eb022ad7fd095bccb058f6007b582ee630fde72..49e106719392e2ab1144ac6dd012874f8d945c3f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
@@ -1100,7 +1100,7 @@ int mlx5_fw_tracer_reload(struct mlx5_fw_tracer *tracer)
        int err;
 
        if (IS_ERR_OR_NULL(tracer))
-               return -EINVAL;
+               return 0;
 
        dev = tracer->dev;
        mlx5_fw_tracer_cleanup(tracer);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
index 255bd0059da17366ce2d1874c91018a99e46bdb6..d5d57630015ffb4c94fba3c74c9ec6a095b84c43 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
@@ -199,16 +199,11 @@ static void mlx5_fw_live_patch_event(struct work_struct *work)
        struct mlx5_fw_reset *fw_reset = container_of(work, struct mlx5_fw_reset,
                                                      fw_live_patch_work);
        struct mlx5_core_dev *dev = fw_reset->dev;
-       struct mlx5_fw_tracer *tracer;
 
        mlx5_core_info(dev, "Live patch updated firmware version: %d.%d.%d\n", fw_rev_maj(dev),
                       fw_rev_min(dev), fw_rev_sub(dev));
 
-       tracer = dev->tracer;
-       if (IS_ERR_OR_NULL(tracer))
-               return;
-
-       if (mlx5_fw_tracer_reload(tracer))
+       if (mlx5_fw_tracer_reload(dev->tracer))
                mlx5_core_err(dev, "Failed to reload FW tracer\n");
 }