Commit ecd01db8 authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Simplify mlx5_register_device to return void 



mlx5_register_device() doesn't check for any error and always returns 0.
Simplify mlx5_register_device() to return void and its caller, remove
dead code related to it.

Reviewed-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent dc638d11

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

+1 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ bool mlx5_device_registered(struct mlx5_core_dev *dev) 
	return found;

}



int mlx5_register_device(struct mlx5_core_dev *dev)

void mlx5_register_device(struct mlx5_core_dev *dev)

{

	struct mlx5_priv *priv = &dev->priv;

	struct mlx5_interface *intf;
@@ -203,8 +203,6 @@ int mlx5_register_device(struct mlx5_core_dev *dev) 
	list_for_each_entry(intf, &intf_list, list)

		mlx5_add_device(intf, priv);

	mutex_unlock(&mlx5_intf_mutex);



	return 0;

}



void mlx5_unregister_device(struct mlx5_core_dev *dev)

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

+3 −11
Original line number Diff line number Diff line
@@ -1211,15 +1211,10 @@ int mlx5_load_one(struct mlx5_core_dev *dev, bool boot) 
			goto err_devlink_reg;

	}



	if (mlx5_device_registered(dev)) {

	if (mlx5_device_registered(dev))

		mlx5_attach_device(dev);

	} else {

		err = mlx5_register_device(dev);

		if (err) {

			mlx5_core_err(dev, "register device failed %d\n", err);

			goto err_reg_dev;

		}

	}

	else

		mlx5_register_device(dev);



	set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);

out:
@@ -1227,9 +1222,6 @@ out: 


	return err;



err_reg_dev:

	if (boot)

		mlx5_devlink_unregister(priv_to_devlink(dev));

err_devlink_reg:

	mlx5_unload(dev);

err_load:

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

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ void mlx5_remove_device(struct mlx5_interface *intf, struct mlx5_priv *priv); 
void mlx5_attach_device(struct mlx5_core_dev *dev);

void mlx5_detach_device(struct mlx5_core_dev *dev);

bool mlx5_device_registered(struct mlx5_core_dev *dev);

int mlx5_register_device(struct mlx5_core_dev *dev);

void mlx5_register_device(struct mlx5_core_dev *dev);

void mlx5_unregister_device(struct mlx5_core_dev *dev);

void mlx5_add_dev_by_protocol(struct mlx5_core_dev *dev, int protocol);

void mlx5_remove_dev_by_protocol(struct mlx5_core_dev *dev, int protocol);

CRA Git | Maintained and supported by SUSTech CRA and CCSE