[PATCH net-next v2] bnx2x: remove redundant NULL-pointer check

Nikita Kiryushin posted 1 patch 1 month ago
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 4 ----
1 file changed, 4 deletions(-)
[PATCH net-next v2] bnx2x: remove redundant NULL-pointer check
Posted by Nikita Kiryushin 1 month ago
bnx2x_get_vf_config() contains NULL-pointer checks for
mac_obj and vlan_obj.

The fields checked are assigned to (after macro expansions):

mac_obj = &((vf)->vfqs[0].mac_obj);
vlan_obj = &((vf)->vfqs[0].vlan_obj);

It is impossible to get NULL for those.

Remove superfluous NULL-pointer check and associated
unreachable code to improve readability.

Signed-off-by: Nikita Kiryushin <kiryushin@ancud.ru>
---
v2:
  - remove confusing part of commit message as Simon Horman <horms@kernel.org>
  suggested in https://lore.kernel.org/lkml/20240715181029.GD249423@kernel.org/
v1: https://lore.kernel.org/lkml/20240712185431.81805-1-kiryushin@ancud.ru/
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index 12198fc3ab22..0f121b15f5d7 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -2619,10 +2619,6 @@ int bnx2x_get_vf_config(struct net_device *dev, int vfidx,
 
 	mac_obj = &bnx2x_leading_vfq(vf, mac_obj);
 	vlan_obj = &bnx2x_leading_vfq(vf, vlan_obj);
-	if (!mac_obj || !vlan_obj) {
-		BNX2X_ERR("VF partially initialized\n");
-		return -EINVAL;
-	}
 
 	ivi->vf = vfidx;
 	ivi->qos = 0;
-- 
2.43.0
Re: [PATCH net-next v2] bnx2x: remove redundant NULL-pointer check
Posted by Jakub Kicinski 3 weeks, 3 days ago
On Fri, 25 Oct 2024 20:42:03 +0300 Nikita Kiryushin wrote:
> bnx2x_get_vf_config() contains NULL-pointer checks for
> mac_obj and vlan_obj.
> 
> The fields checked are assigned to (after macro expansions):
> 
> mac_obj = &((vf)->vfqs[0].mac_obj);
> vlan_obj = &((vf)->vfqs[0].vlan_obj);
> 
> It is impossible to get NULL for those.
> 
> Remove superfluous NULL-pointer check and associated
> unreachable code to improve readability.

this is an old driver and the 4 saved LoC on the control path
don't seem to justify the review effort needed, anyway, sorry.
-- 
pw-bot: reject