Skip to content

Commit d7ca9a3

Browse files
GustavoARSilvakuba-moo
authored andcommitted
net: hinic: Use devm_kcalloc() instead of devm_kzalloc()
Use 2-factor multiplication argument form devm_kcalloc() instead of devm_kzalloc(). Link: KSPP/linux#162 Signed-off-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Kees Cook <[email protected]> Link: https://lore.kernel.org/r/20211208003527.GA75483@embeddedor Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 28a0a04 commit d7ca9a3

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/net/ethernet/huawei/hinic/hinic_hw_io.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -375,31 +375,30 @@ int hinic_io_create_qps(struct hinic_func_to_io *func_to_io,
375375
{
376376
struct hinic_hwif *hwif = func_to_io->hwif;
377377
struct pci_dev *pdev = hwif->pdev;
378-
size_t qps_size, wq_size, db_size;
379378
void *ci_addr_base;
380379
int i, j, err;
381380

382-
qps_size = num_qps * sizeof(*func_to_io->qps);
383-
func_to_io->qps = devm_kzalloc(&pdev->dev, qps_size, GFP_KERNEL);
381+
func_to_io->qps = devm_kcalloc(&pdev->dev, num_qps,
382+
sizeof(*func_to_io->qps), GFP_KERNEL);
384383
if (!func_to_io->qps)
385384
return -ENOMEM;
386385

387-
wq_size = num_qps * sizeof(*func_to_io->sq_wq);
388-
func_to_io->sq_wq = devm_kzalloc(&pdev->dev, wq_size, GFP_KERNEL);
386+
func_to_io->sq_wq = devm_kcalloc(&pdev->dev, num_qps,
387+
sizeof(*func_to_io->sq_wq), GFP_KERNEL);
389388
if (!func_to_io->sq_wq) {
390389
err = -ENOMEM;
391390
goto err_sq_wq;
392391
}
393392

394-
wq_size = num_qps * sizeof(*func_to_io->rq_wq);
395-
func_to_io->rq_wq = devm_kzalloc(&pdev->dev, wq_size, GFP_KERNEL);
393+
func_to_io->rq_wq = devm_kcalloc(&pdev->dev, num_qps,
394+
sizeof(*func_to_io->rq_wq), GFP_KERNEL);
396395
if (!func_to_io->rq_wq) {
397396
err = -ENOMEM;
398397
goto err_rq_wq;
399398
}
400399

401-
db_size = num_qps * sizeof(*func_to_io->sq_db);
402-
func_to_io->sq_db = devm_kzalloc(&pdev->dev, db_size, GFP_KERNEL);
400+
func_to_io->sq_db = devm_kcalloc(&pdev->dev, num_qps,
401+
sizeof(*func_to_io->sq_db), GFP_KERNEL);
403402
if (!func_to_io->sq_db) {
404403
err = -ENOMEM;
405404
goto err_sq_db;

0 commit comments

Comments
 (0)