| Message ID | af578bd3eb471b9613bcba7f714cca7e297a4620.1643214385.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d9f393f468aa939b53cc81b43169953ce37d7cdb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] nfp: nsp: Simplify array allocation | expand |
On Wed, Jan 26, 2022 at 04:30:33PM +0000, Robin Murphy wrote: > Prefer kcalloc() to kzalloc(array_size()) for allocating an array. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Hi Robin, thanks for the cleanup. One minor nit: I think "nfp: " would be a slightly more normal prefix than "nfp: nsp: ". That notwithstanding, Acked-by: Simon Horman <simon.horman@corigine.com> > --- > drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c > index 10e7d8b21c46..730fea214b8a 100644 > --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c > +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c > @@ -513,7 +513,7 @@ nfp_nsp_command_buf_dma_sg(struct nfp_nsp *nsp, > dma_size = BIT_ULL(dma_order); > nseg = DIV_ROUND_UP(max_size, chunk_size); > > - chunks = kzalloc(array_size(sizeof(*chunks), nseg), GFP_KERNEL); > + chunks = kcalloc(nseg, sizeof(*chunks), GFP_KERNEL); > if (!chunks) > return -ENOMEM; > > -- > 2.28.0.dirty >
On 2022-01-27 09:06, Simon Horman wrote: > On Wed, Jan 26, 2022 at 04:30:33PM +0000, Robin Murphy wrote: >> Prefer kcalloc() to kzalloc(array_size()) for allocating an array. >> >> Signed-off-by: Robin Murphy <robin.murphy@arm.com> > > Hi Robin, > > thanks for the cleanup. > > One minor nit: I think "nfp: " would be a slightly more normal prefix > than "nfp: nsp: ". Ah, OK - from the git history it seemed about 50/50 one way or the other, so I guessed at the one that looked more specific to this particular file. I ran into this little anti-pattern in code I was working on, and this was the only other instance that a quick grep turned up so I figured I may as well fix it too. > That notwithstanding, > > Acked-by: Simon Horman <simon.horman@corigine.com> Thanks! Robin. >> --- >> drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c >> index 10e7d8b21c46..730fea214b8a 100644 >> --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c >> +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c >> @@ -513,7 +513,7 @@ nfp_nsp_command_buf_dma_sg(struct nfp_nsp *nsp, >> dma_size = BIT_ULL(dma_order); >> nseg = DIV_ROUND_UP(max_size, chunk_size); >> >> - chunks = kzalloc(array_size(sizeof(*chunks), nseg), GFP_KERNEL); >> + chunks = kcalloc(nseg, sizeof(*chunks), GFP_KERNEL); >> if (!chunks) >> return -ENOMEM; >> >> -- >> 2.28.0.dirty >>
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Wed, 26 Jan 2022 16:30:33 +0000 you wrote: > Prefer kcalloc() to kzalloc(array_size()) for allocating an array. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [net-next] nfp: nsp: Simplify array allocation https://git.kernel.org/netdev/net-next/c/d9f393f468aa You are awesome, thank you!
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c index 10e7d8b21c46..730fea214b8a 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c @@ -513,7 +513,7 @@ nfp_nsp_command_buf_dma_sg(struct nfp_nsp *nsp, dma_size = BIT_ULL(dma_order); nseg = DIV_ROUND_UP(max_size, chunk_size); - chunks = kzalloc(array_size(sizeof(*chunks), nseg), GFP_KERNEL); + chunks = kcalloc(nseg, sizeof(*chunks), GFP_KERNEL); if (!chunks) return -ENOMEM;
Prefer kcalloc() to kzalloc(array_size()) for allocating an array. Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)