Skip to contentSkip to conversation

net/mlx5: delete dead code in mlx5_esw_unlock()

PATCH In review Dan Carpenter 2 participants 3 messages May 30, 2022 – Jun 1, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/mlx5: delete dead code in mlx5_esw_unlock()

Smatch complains about this function:

    drivers/net/ethernet/mellanox/mlx5/core/eswitch.c:2000 mlx5_esw_unlock()
    warn: inconsistent returns '&esw->mode_lock'.

Before commit ec2fa47d7b98 ("net/mlx5: Lag, use lag lock") there used to be a matching mlx5_esw_lock() function and the lock and unlock functions were symmetric. But now we take the long unconditionally and must unlock unconditionally as well.

As near as I can tell this is dead code and can just be deleted.

---
 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 --
 1 file changed, 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +0 -2
index 719ef26d23c0..3e662e389be4 100644
@@ -1995,8 +1995,6 @@ int mlx5_esw_try_lock(struct mlx5_eswitch *esw)
  */
 void mlx5_esw_unlock(struct mlx5_eswitch *esw)
 {
-	if (!mlx5_esw_allowed(esw))
-		return;
 	up_write(&esw->mode_lock);
 }
 
Signature · 1 line
2.35.1
#1 lore raw

On 30 May 14:40, Dan Carpenter wrote:

You can use [PATCH net-mlx5] for fixes and [PATCH net-next-mlx5] for none-critical commits.

Quoted 8 lines

Smatch complains about this function:

   drivers/net/ethernet/mellanox/mlx5/core/eswitch.c:2000 mlx5_esw_unlock()
   warn: inconsistent returns '&esw->mode_lock'.

Before commit ec2fa47d7b98 ("net/mlx5: Lag, use lag lock") there used to be a matching mlx5_esw_lock() function and the lock and unlock functions were symmetric. But now we take the long

^ lock ?

Quoted 5 lines

unconditionally and must unlock unconditionally as well.

As near as I can tell this is dead code and can just be deleted.

Fixed up the typo and applied to net-next-mlx5.

Thanks,
Saeed.

#2 lore raw
Quoted 5 lines · Saeed Mahameed

On 30 May 14:40, Dan Carpenter wrote:

You can use [PATCH net-mlx5] for fixes and [PATCH net-next-mlx5] for none-critical commits.

Realistically, there is no way I'm going to remember that and there isn't an automated way to look it up.

I try really hard to get the net tree stuff correct so when netdev is on the CC list. But putting the correct net tree in the subject line is quite a huge headache and I quite often get it wrong.

Quoted 9 lines
Quoted 8 lines

Smatch complains about this function:

   drivers/net/ethernet/mellanox/mlx5/core/eswitch.c:2000 mlx5_esw_unlock()
   warn: inconsistent returns '&esw->mode_lock'.

Before commit ec2fa47d7b98 ("net/mlx5: Lag, use lag lock") there used to be a matching mlx5_esw_lock() function and the lock and unlock functions were symmetric. But now we take the long

^ lock ?

Heh. Thanks.

regards,
dan carpenter