Skip to content

Commit af9911c

Browse files
vadimp-nvidiadavem330
vadimp-nvidia
authored and
davem330
committed
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: Vadim Pasternak <vadimp@nvidia.com> Signed-off-by: Ido Schimmel <idosch@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 719fc06 commit af9911c

File tree

1 file changed

+0
-24
lines changed

1 file changed

+0
-24
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,6 @@ int mlxsw_env_reset_module(struct net_device *netdev,
462462
!(req & (ETH_RESET_PHY << ETH_RESET_SHARED_SHIFT)))
463463
return 0;
464464

465-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
466-
return -EINVAL;
467-
468465
mutex_lock(&mlxsw_env->module_info_lock);
469466

470467
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,
510507
u32 status_bits;
511508
int err;
512509

513-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
514-
return -EINVAL;
515-
516510
mutex_lock(&mlxsw_env->module_info_lock);
517511

518512
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,
620614
bool low_power;
621615
int err = 0;
622616

623-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
624-
return -EINVAL;
625-
626617
if (policy != ETHTOOL_MODULE_POWER_MODE_POLICY_HIGH &&
627618
policy != ETHTOOL_MODULE_POWER_MODE_POLICY_AUTO) {
628619
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,
966957
{
967958
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
968959

969-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
970-
return -EINVAL;
971-
972960
mutex_lock(&mlxsw_env->module_info_lock);
973961
*p_counter = mlxsw_env->module_info[module].module_overheat_counter;
974962
mutex_unlock(&mlxsw_env->module_info_lock);
@@ -981,9 +969,6 @@ void mlxsw_env_module_port_map(struct mlxsw_core *mlxsw_core, u8 module)
981969
{
982970
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
983971

984-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
985-
return;
986-
987972
mutex_lock(&mlxsw_env->module_info_lock);
988973
mlxsw_env->module_info[module].num_ports_mapped++;
989974
mutex_unlock(&mlxsw_env->module_info_lock);
@@ -994,9 +979,6 @@ void mlxsw_env_module_port_unmap(struct mlxsw_core *mlxsw_core, u8 module)
994979
{
995980
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
996981

997-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
998-
return;
999-
1000982
mutex_lock(&mlxsw_env->module_info_lock);
1001983
mlxsw_env->module_info[module].num_ports_mapped--;
1002984
mutex_unlock(&mlxsw_env->module_info_lock);
@@ -1008,9 +990,6 @@ int mlxsw_env_module_port_up(struct mlxsw_core *mlxsw_core, u8 module)
1008990
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
1009991
int err = 0;
1010992

1011-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
1012-
return -EINVAL;
1013-
1014993
mutex_lock(&mlxsw_env->module_info_lock);
1015994

1016995
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)
10401019
{
10411020
struct mlxsw_env *mlxsw_env = mlxsw_core_env(mlxsw_core);
10421021

1043-
if (WARN_ON_ONCE(module >= mlxsw_env->module_count))
1044-
return;
1045-
10461022
mutex_lock(&mlxsw_env->module_info_lock);
10471023

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

0 commit comments

Comments
 (0)