Commit af9911c5 authored by Vadim Pasternak's avatar Vadim Pasternak Committed by David S. Miller
Browse files

mlxsw: core: Remove unnecessary asserts 



Remove unnecessary asserts for module index validation. Leave only one
that is actually necessary in mlxsw_env_pmpe_listener_func() where the
module index is directly read from the firmware event.

Signed-off-by: default avatarVadim Pasternak <vadimp@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 719fc066

drivers/net/ethernet/mellanox/mlxsw/core_env.c

+0 −24
Original line number Diff line number Diff line
@@ -462,9 +462,6 @@ int mlxsw_env_reset_module(struct net_device *netdev, 
	    !(req & (ETH_RESET_PHY << ETH_RESET_SHARED_SHIFT)))

		return 0;



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return -EINVAL;



	mutex_lock(&mlxsw_env->module_info_lock);



	err = __mlxsw_env_validate_module_type(mlxsw_core, module);
@@ -510,9 +507,6 @@ mlxsw_env_get_module_power_mode(struct mlxsw_core *mlxsw_core, u8 module, 
	u32 status_bits;

	int err;



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return -EINVAL;



	mutex_lock(&mlxsw_env->module_info_lock);



	err = __mlxsw_env_validate_module_type(mlxsw_core, module);
@@ -620,9 +614,6 @@ mlxsw_env_set_module_power_mode(struct mlxsw_core *mlxsw_core, u8 module, 
	bool low_power;

	int err = 0;



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return -EINVAL;



	if (policy != ETHTOOL_MODULE_POWER_MODE_POLICY_HIGH &&

	    policy != ETHTOOL_MODULE_POWER_MODE_POLICY_AUTO) {

		NL_SET_ERR_MSG_MOD(extack, "Unsupported power mode policy");
@@ -966,9 +957,6 @@ mlxsw_env_module_overheat_counter_get(struct mlxsw_core *mlxsw_core, u8 module, 
{

	struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return -EINVAL;



	mutex_lock(&mlxsw_env->module_info_lock);

	*p_counter = mlxsw_env->module_info[module].module_overheat_counter;

	mutex_unlock(&mlxsw_env->module_info_lock);
@@ -981,9 +969,6 @@ void mlxsw_env_module_port_map(struct mlxsw_core *mlxsw_core, u8 module) 
{

	struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return;



	mutex_lock(&mlxsw_env->module_info_lock);

	mlxsw_env->module_info[module].num_ports_mapped++;

	mutex_unlock(&mlxsw_env->module_info_lock);
@@ -994,9 +979,6 @@ void mlxsw_env_module_port_unmap(struct mlxsw_core *mlxsw_core, u8 module) 
{

	struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return;



	mutex_lock(&mlxsw_env->module_info_lock);

	mlxsw_env->module_info[module].num_ports_mapped--;

	mutex_unlock(&mlxsw_env->module_info_lock);
@@ -1008,9 +990,6 @@ int mlxsw_env_module_port_up(struct mlxsw_core *mlxsw_core, u8 module) 
	struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);

	int err = 0;



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return -EINVAL;



	mutex_lock(&mlxsw_env->module_info_lock);



	if (mlxsw_env->module_info[module].power_mode_policy !=
@@ -1040,9 +1019,6 @@ void mlxsw_env_module_port_down(struct mlxsw_core *mlxsw_core, u8 module) 
{

	struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);



	if (WARN_ON_ONCE(module >= mlxsw_env->module_count))

		return;



	mutex_lock(&mlxsw_env->module_info_lock);



	mlxsw_env->module_info[module].num_ports_up--;