Skip to contentSkip to conversation

net/mlx5: Lag, Remove NULL check before dev_{put, hold}

PATCH In review Jiapeng Chong 5 participants 5 messages Jun 19, 2024 – Jun 20, 2024

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

PATCH 1/1 net/mlx5: Lag, Remove NULL check before dev_{put, hold}

The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there is no need to check before using dev_{put, hold}, remove it to silence the warning:

./drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c:1518:2-10: WARNING: NULL check before dev_{put, hold} functions is not needed.

---
 drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +1 -2
index d0871c46b8c5..a2fd9a84f877 100644
@@ -1514,8 +1514,7 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
 	} else {
 		ndev = ldev->pf[MLX5_LAG_P1].netdev;
 	}
-	if (ndev)
-		dev_hold(ndev);
+	dev_hold(ndev);
 
 unlock:
 	spin_unlock_irqrestore(&lag_lock, flags);
Signature · 1 line
2.20.1.7.g153144c
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Jiapeng Chong

The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there is no need to check before using dev_{put, hold}, remove it to silence the warning:

./drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c:1518:2-10: WARNING: NULL check before dev_{put, hold} functions is not needed.

---
 drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +0 -0
index d0871c46b8c5..a2fd9a84f877 100644

drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev) · line 1517

Quoted 6 lines
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +1 -2
@@ -1514,8 +1514,7 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
 	} else {
 		ndev = ldev->pf[MLX5_LAG_P1].netdev;
 	}
-	if (ndev)
-		dev_hold(ndev);
+	dev_hold(ndev);

Looks safe, dev_hold() -> netdev_hold() which checks for ndev.

Quoted 3 lines
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +0 -0
 unlock:
 	spin_unlock_irqrestore(&lag_lock, flags);
Reviewed-by on v1 1/1
#2 lore raw
In reply to Jiapeng Chong
Quoted 18 lines · Jiapeng Chong

The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there is no need to check before using dev_{put, hold}, remove it to silence the warning:

./drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c:1518:2-10: WARNING: NULL check before dev_{put, hold} functions is not needed.

---
  drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +0 -0
index d0871c46b8c5..a2fd9a84f877 100644

drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev) · line 1520

Quoted 9 lines
drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c +1 -2
@@ -1514,8 +1514,7 @@ struct net_device *mlx5_lag_get_roce_netdev(struct mlx5_core_dev *dev)
  	} else {
  		ndev = ldev->pf[MLX5_LAG_P1].netdev;
  	}
-	if (ndev)
-		dev_hold(ndev);
+	dev_hold(ndev);
 
  unlock:
  	spin_unlock_irqrestore(&lag_lock, flags);

Thanks.

maintainer
#3 lore raw
In reply to Jiapeng Chong
Quoted 1 line · On Wed, 19 Jun 2024 11:53:57 +0800 Jiapeng Chong wrote:

The call netdev_{put, hold} of dev_{put, hold} will check NULL

s/of/or/

if you're touching this why not convert to netdev_hold() at the same time?

Signature · 1 line
pw-bot: au
reviewer Reviewed-by on v1 1/1
#4 lore raw
In reply to Jiapeng Chong
Quoted 9 lines · Jiapeng Chong

The call netdev_{put, hold} of dev_{put, hold} will check NULL, so there is no need to check before using dev_{put, hold}, remove it to silence the warning:

./drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c:1518:2-10: WARNING: NULL check before dev_{put, hold} functions is not needed.