Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / mellanox / mlx5 / core / devlink.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index dcf9f27..7d56a92 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -625,7 +625,6 @@ static int mlx5_devlink_eth_param_register(struct devlink *devlink)
        devlink_param_driverinit_value_set(devlink,
                                           DEVLINK_PARAM_GENERIC_ID_ENABLE_ETH,
                                           value);
-       devlink_param_publish(devlink, &enable_eth_param);
        return 0;
 }
 
@@ -636,7 +635,6 @@ static void mlx5_devlink_eth_param_unregister(struct devlink *devlink)
        if (!mlx5_eth_supported(dev))
                return;
 
-       devlink_param_unpublish(devlink, &enable_eth_param);
        devlink_param_unregister(devlink, &enable_eth_param);
 }
 
@@ -672,7 +670,6 @@ static int mlx5_devlink_rdma_param_register(struct devlink *devlink)
        devlink_param_driverinit_value_set(devlink,
                                           DEVLINK_PARAM_GENERIC_ID_ENABLE_RDMA,
                                           value);
-       devlink_param_publish(devlink, &enable_rdma_param);
        return 0;
 }
 
@@ -681,7 +678,6 @@ static void mlx5_devlink_rdma_param_unregister(struct devlink *devlink)
        if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))
                return;
 
-       devlink_param_unpublish(devlink, &enable_rdma_param);
        devlink_param_unregister(devlink, &enable_rdma_param);
 }
 
@@ -706,7 +702,6 @@ static int mlx5_devlink_vnet_param_register(struct devlink *devlink)
        devlink_param_driverinit_value_set(devlink,
                                           DEVLINK_PARAM_GENERIC_ID_ENABLE_VNET,
                                           value);
-       devlink_param_publish(devlink, &enable_rdma_param);
        return 0;
 }
 
@@ -717,7 +712,6 @@ static void mlx5_devlink_vnet_param_unregister(struct devlink *devlink)
        if (!mlx5_vnet_supported(dev))
                return;
 
-       devlink_param_unpublish(devlink, &enable_vnet_param);
        devlink_param_unregister(devlink, &enable_vnet_param);
 }
 
@@ -808,7 +802,6 @@ int mlx5_devlink_register(struct devlink *devlink)
        if (err)
                goto params_reg_err;
        mlx5_devlink_set_params_init_values(devlink);
-       devlink_params_publish(devlink);
 
        err = mlx5_devlink_auxdev_params_register(devlink);
        if (err)
@@ -818,6 +811,7 @@ int mlx5_devlink_register(struct devlink *devlink)
        if (err)
                goto traps_reg_err;
 
+       devlink_params_publish(devlink);
        return 0;
 
 traps_reg_err:
@@ -832,9 +826,9 @@ params_reg_err:
 
 void mlx5_devlink_unregister(struct devlink *devlink)
 {
+       devlink_params_unpublish(devlink);
        mlx5_devlink_traps_unregister(devlink);
        mlx5_devlink_auxdev_params_unregister(devlink);
-       devlink_params_unpublish(devlink);
        devlink_params_unregister(devlink, mlx5_devlink_params,
                                  ARRAY_SIZE(mlx5_devlink_params));
        devlink_unregister(devlink);