| Message ID | 20240409215431.41424-3-michael.chan@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 43226dccd1bd74c6bf97d8d357e782f4922d39e3 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bnxt_en: Updates for net-next | expand |
On 4/9/2024 2:54 PM, Michael Chan wrote: > From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > > The memory for "edev->ulp_tbl" is allocated inside the > bnxt_rdma_aux_device_init() function. If it fails, the driver > will not create the auxiliary device for RoCE. Hence the NULL > check inside bnxt_register_dev() is unnecessary. > > Reviewed-by: Vikas Gupta <vikas.gupta@broadcom.com> > Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com> > Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com> > Signed-off-by: Michael Chan <michael.chan@broadcom.com> > --- > drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > index 86dcd2c76587..fd890819d4bc 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > @@ -64,9 +64,6 @@ int bnxt_register_dev(struct bnxt_en_dev *edev, > return -ENOMEM; > > ulp = edev->ulp_tbl; > - if (!ulp) > - return -ENOMEM; > - > ulp->handle = handle; > rcu_assign_pointer(ulp->ulp_ops, ulp_ops); > Ok, so ulp_tbl is setup by bnxt_rdma_aux_device_init, and you're claiming that the only way bnxt_register_dev gets called is if the auxiliary driver loads? But bnxt_register_dev is a simple direct-exported function, so the bnxt driver itself doesn't enforce this. However, if we go look at the infiniband driver that does call bnxt_register_dev, it only calls this as part of its auxiliary device probe. This does make the NULL check here seem redundant, though I think its a lot more layered than a normal removal of a NULL check since this crosses module boundary and its a bit subtle to follow the full flow of the auxiliary drivers. Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c index 86dcd2c76587..fd890819d4bc 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c @@ -64,9 +64,6 @@ int bnxt_register_dev(struct bnxt_en_dev *edev, return -ENOMEM; ulp = edev->ulp_tbl; - if (!ulp) - return -ENOMEM; - ulp->handle = handle; rcu_assign_pointer(ulp->ulp_ops, ulp_ops);