diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2022-02-18 18:46:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-02-19 16:38:12 +0000 |
| commit | 92c54a65e6a82a897a9fecaae8de6c57682ba510 (patch) | |
| tree | 532d63482392d6a08449cf69f12601c73366cb57 | |
| parent | 32d51cef91dbd6a95616b99d9f061e62be3aef30 (diff) | |
| download | linux-92c54a65e6a82a897a9fecaae8de6c57682ba510.tar.gz linux-92c54a65e6a82a897a9fecaae8de6c57682ba510.tar.bz2 linux-92c54a65e6a82a897a9fecaae8de6c57682ba510.zip | |
atm: nicstar: Use kcalloc() to simplify code
Use kcalloc() instead of kmalloc_array() and a loop to set all the values
of the array to NULL.
While at it, remove a duplicated assignment to 'scq->num_entries'.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/atm/nicstar.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index bc5a6ab6fa4b..1a50de39f5b5 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -861,7 +861,6 @@ static void ns_init_card_error(ns_dev *card, int error) static scq_info *get_scq(ns_dev *card, int size, u32 scd) { scq_info *scq; - int i; if (size != VBR_SCQSIZE && size != CBR_SCQSIZE) return NULL; @@ -875,9 +874,8 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd) kfree(scq); return NULL; } - scq->skb = kmalloc_array(size / NS_SCQE_SIZE, - sizeof(*scq->skb), - GFP_KERNEL); + scq->skb = kcalloc(size / NS_SCQE_SIZE, sizeof(*scq->skb), + GFP_KERNEL); if (!scq->skb) { dma_free_coherent(&card->pcidev->dev, 2 * size, scq->org, scq->dma); @@ -890,15 +888,11 @@ static scq_info *get_scq(ns_dev *card, int size, u32 scd) scq->last = scq->base + (scq->num_entries - 1); scq->tail = scq->last; scq->scd = scd; - scq->num_entries = size / NS_SCQE_SIZE; scq->tbd_count = 0; init_waitqueue_head(&scq->scqfull_waitq); scq->full = 0; spin_lock_init(&scq->lock); - for (i = 0; i < scq->num_entries; i++) - scq->skb[i] = NULL; - return scq; } |