net/mlx5: Have single error unwinding path

Having multiple error unwinding path are error prone.
Lets have just one error unwinding path.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 742ba012c2346151e456e15f5fb586a47d17c9bc..2e128068a48c2944716313cd05c9622c87c82d02 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1217,10 +1217,9 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot)
                mlx5_register_device(dev);
 
        set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);
-out:
-       mutex_unlock(&dev->intf_state_mutex);
 
-       return err;
+       mutex_unlock(&dev->intf_state_mutex);
+       return 0;
 
 err_devlink_reg:
        mlx5_unload(dev);
@@ -1230,8 +1229,8 @@ err_load:
 function_teardown:
        mlx5_function_teardown(dev, boot);
        dev->state = MLX5_DEVICE_STATE_INTERNAL_ERROR;
+out:
        mutex_unlock(&dev->intf_state_mutex);
-
        return err;
 }