| Message ID | 1537430541-37817-1-git-send-email-zhongjiang@huawei.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: netronome: remove redundant continue | expand |
On Thu, 20 Sep 2018 16:02:21 +0800, zhong jiang wrote: > The continue will not truely skip any code. hence it is safe to > remove it. > > Signed-off-by: zhong jiang <zhongjiang@huawei.com> I think this came up during review at some point. I still prefer to keep the continue. The body of the loop performs initialization of objects, if an object is removed we shouldn't carry on with the body. It's easy to miss that the object got freed otherwise, there is no error being set and no warning printed... > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c > index 0b1ac9c..50d7b58 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c > +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c > @@ -230,10 +230,8 @@ static void nfp_net_pf_free_vnics(struct nfp_pf *pf) > ctrl_bar += NFP_PF_CSR_SLICE_SIZE; > > /* Kill the vNIC if app init marked it as invalid */ > - if (nn->port && nn->port->type == NFP_PORT_INVALID) { > + if (nn->port && nn->port->type == NFP_PORT_INVALID) > nfp_net_pf_free_vnic(pf, nn); > - continue; > - } > } > > if (list_empty(&pf->vnics))
On 2018/9/21 0:38, Jakub Kicinski wrote: > On Thu, 20 Sep 2018 16:02:21 +0800, zhong jiang wrote: >> The continue will not truely skip any code. hence it is safe to >> remove it. >> >> Signed-off-by: zhong jiang <zhongjiang@huawei.com> > I think this came up during review at some point. I still prefer to > keep the continue. The body of the loop performs initialization of > objects, if an object is removed we shouldn't carry on with the body. > It's easy to miss that the object got freed otherwise, there is no > error being set and no warning printed... IMO, we should bring it back when the case truely occur you have said. At present. We should not take too much into account. Maybe it will not occur. Thanks, zhong jiang >> diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c >> index 0b1ac9c..50d7b58 100644 >> --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c >> +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c >> @@ -230,10 +230,8 @@ static void nfp_net_pf_free_vnics(struct nfp_pf *pf) >> ctrl_bar += NFP_PF_CSR_SLICE_SIZE; >> >> /* Kill the vNIC if app init marked it as invalid */ >> - if (nn->port && nn->port->type == NFP_PORT_INVALID) { >> + if (nn->port && nn->port->type == NFP_PORT_INVALID) >> nfp_net_pf_free_vnic(pf, nn); >> - continue; >> - } >> } >> >> if (list_empty(&pf->vnics)) > > . >
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c index 0b1ac9c..50d7b58 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_main.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_main.c @@ -230,10 +230,8 @@ static void nfp_net_pf_free_vnics(struct nfp_pf *pf) ctrl_bar += NFP_PF_CSR_SLICE_SIZE; /* Kill the vNIC if app init marked it as invalid */ - if (nn->port && nn->port->type == NFP_PORT_INVALID) { + if (nn->port && nn->port->type == NFP_PORT_INVALID) nfp_net_pf_free_vnic(pf, nn); - continue; - } } if (list_empty(&pf->vnics))
The continue will not truely skip any code. hence it is safe to remove it. Signed-off-by: zhong jiang <zhongjiang@huawei.com> --- drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)