Commit ee205626 authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller
Browse files

ionic: use kcalloc for new arrays 



Use kcalloc for allocating arrays of structures.

Following along after
commit e71642009cbdA ("ionic_lif: Use devm_kcalloc() in ionic_qcq_alloc()")
there are a couple more array allocations that can be converted
to using devm_kcalloc().

Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9aa1c152

drivers/net/ethernet/pensando/ionic/ionic_lif.c

+4 −4
Original line number Diff line number Diff line
@@ -522,7 +522,6 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, 
static int ionic_qcqs_alloc(struct ionic_lif *lif)

{

	struct device *dev = lif->ionic->dev;

	unsigned int q_list_size;

	unsigned int flags;

	int err;

	int i;
@@ -552,9 +551,9 @@ static int ionic_qcqs_alloc(struct ionic_lif *lif) 
		ionic_link_qcq_interrupts(lif->adminqcq, lif->notifyqcq);

	}



	q_list_size = sizeof(*lif->txqcqs) * lif->nxqs;

	err = -ENOMEM;

	lif->txqcqs = devm_kzalloc(dev, q_list_size, GFP_KERNEL);

	lif->txqcqs = devm_kcalloc(dev, lif->ionic->ntxqs_per_lif,

				   sizeof(*lif->txqcqs), GFP_KERNEL);

	if (!lif->txqcqs)

		goto err_out_free_notifyqcq;

	for (i = 0; i < lif->nxqs; i++) {
@@ -565,7 +564,8 @@ static int ionic_qcqs_alloc(struct ionic_lif *lif) 
			goto err_out_free_tx_stats;

	}



	lif->rxqcqs = devm_kzalloc(dev, q_list_size, GFP_KERNEL);

	lif->rxqcqs = devm_kcalloc(dev, lif->ionic->nrxqs_per_lif,

				   sizeof(*lif->rxqcqs), GFP_KERNEL);

	if (!lif->rxqcqs)

		goto err_out_free_tx_stats;

	for (i = 0; i < lif->nxqs; i++) {