net/mlx5: Remove MLX5E_LOCKED_FLOW flag

The MLX5E_LOCKED_FLOW flag is not checked anywhere now so remove it
entirely.

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/dev.c b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
index 5b6b0b126e52358079b3dd773360bb4baf1fb8f7..2b444fb1238830126816e134f0113d84f3102231 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c
@@ -349,7 +349,6 @@ int mlx5_attach_device(struct mlx5_core_dev *dev)
        devl_assert_locked(priv_to_devlink(dev));
        mutex_lock(&mlx5_intf_mutex);
        priv->flags &= ~MLX5_PRIV_FLAGS_DETACH;
-       priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;
        for (i = 0; i < ARRAY_SIZE(mlx5_adev_devices); i++) {
                if (!priv->adev[i]) {
                        bool is_supported = false;
@@ -397,7 +396,6 @@ int mlx5_attach_device(struct mlx5_core_dev *dev)
                        break;
                }
        }
-       priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;
        mutex_unlock(&mlx5_intf_mutex);
        return ret;
 }
@@ -412,7 +410,6 @@ void mlx5_detach_device(struct mlx5_core_dev *dev)
 
        devl_assert_locked(priv_to_devlink(dev));
        mutex_lock(&mlx5_intf_mutex);
-       priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;
        for (i = ARRAY_SIZE(mlx5_adev_devices) - 1; i >= 0; i--) {
                if (!priv->adev[i])
                        continue;
@@ -441,7 +438,6 @@ skip_suspend:
                del_adev(&priv->adev[i]->adev);
                priv->adev[i] = NULL;
        }
-       priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;
        priv->flags |= MLX5_PRIV_FLAGS_DETACH;
        mutex_unlock(&mlx5_intf_mutex);
 }
@@ -540,22 +536,16 @@ del_adev:
 int mlx5_rescan_drivers_locked(struct mlx5_core_dev *dev)
 {
        struct mlx5_priv *priv = &dev->priv;
-       int err = 0;
 
        lockdep_assert_held(&mlx5_intf_mutex);
        if (priv->flags & MLX5_PRIV_FLAGS_DETACH)
                return 0;
 
-       priv->flags |= MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;
        delete_drivers(dev);
        if (priv->flags & MLX5_PRIV_FLAGS_DISABLE_ALL_ADEV)
-               goto out;
-
-       err = add_drivers(dev);
+               return 0;
 
-out:
-       priv->flags &= ~MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW;
-       return err;
+       return add_drivers(dev);
 }
 
 bool mlx5_same_hw_devs(struct mlx5_core_dev *dev, struct mlx5_core_dev *peer_dev)

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index b957b8f22a6bcaf23a44967028958b79ce4265fc..44167760ff29e458bb88fd54d2a3e7196488c6d6 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -554,10 +554,6 @@ enum {
         * creation/deletion on drivers rescan. Unset during device attach.
         */
        MLX5_PRIV_FLAGS_DETACH = 1 << 2,
-       /* Distinguish between mlx5e_probe/remove called by module init/cleanup
-        * and called by other flows which can already hold devlink lock
-        */
-       MLX5_PRIV_FLAGS_MLX5E_LOCKED_FLOW = 1 << 3,
 };
 
 struct mlx5_adev {