Commit c8aebff4 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net/mlx5: Change devlink param register/unregister function names 



The functions are registering and unregistering devlink params, so
change the names accordingly.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 86e99b5b

drivers/net/ethernet/mellanox/mlx5/core/devlink.c

+2 −2
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ void mlx5_devlink_traps_unregister(struct devlink *devlink) 
				    ARRAY_SIZE(mlx5_trap_groups_arr));

}



int mlx5_devlink_register(struct devlink *devlink)

int mlx5_devlink_params_register(struct devlink *devlink)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	int err;
@@ -902,7 +902,7 @@ int mlx5_devlink_register(struct devlink *devlink) 
	return err;

}



void mlx5_devlink_unregister(struct devlink *devlink)

void mlx5_devlink_params_unregister(struct devlink *devlink)

{

	mlx5_devlink_max_uc_list_param_unregister(devlink);

	mlx5_devlink_auxdev_params_unregister(devlink);

drivers/net/ethernet/mellanox/mlx5/core/devlink.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void mlx5_devlink_traps_unregister(struct devlink *devlink); 


struct devlink *mlx5_devlink_alloc(struct device *dev);

void mlx5_devlink_free(struct devlink *devlink);

int mlx5_devlink_register(struct devlink *devlink);

void mlx5_devlink_unregister(struct devlink *devlink);

int mlx5_devlink_params_register(struct devlink *devlink);

void mlx5_devlink_params_unregister(struct devlink *devlink);



#endif /* __MLX5_DEVLINK_H__ */

drivers/net/ethernet/mellanox/mlx5/core/main.c

+5 −5
Original line number Diff line number Diff line
@@ -1390,9 +1390,9 @@ int mlx5_init_one(struct mlx5_core_dev *dev) 


	set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);



	err = mlx5_devlink_register(priv_to_devlink(dev));

	err = mlx5_devlink_params_register(priv_to_devlink(dev));

	if (err)

		goto err_devlink_reg;

		goto err_devlink_params_reg;



	err = mlx5_register_device(dev);

	if (err)
@@ -1403,8 +1403,8 @@ int mlx5_init_one(struct mlx5_core_dev *dev) 
	return 0;



err_register:

	mlx5_devlink_unregister(priv_to_devlink(dev));

err_devlink_reg:

	mlx5_devlink_params_unregister(priv_to_devlink(dev));

err_devlink_params_reg:

	clear_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);

	mlx5_unload(dev);

err_load:
@@ -1426,7 +1426,7 @@ void mlx5_uninit_one(struct mlx5_core_dev *dev) 
	mutex_lock(&dev->intf_state_mutex);



	mlx5_unregister_device(dev);

	mlx5_devlink_unregister(priv_to_devlink(dev));

	mlx5_devlink_params_unregister(priv_to_devlink(dev));



	if (!test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {

		mlx5_core_warn(dev, "%s: interface is down, NOP\n",