]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ibmveth: consolidate kmalloc of array, memset 0 to kcalloc
authorNicholas Mc Guire <hofrat@osadl.org>
Sun, 20 Dec 2015 14:06:18 +0000 (15:06 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Dec 2015 17:59:41 +0000 (12:59 -0500)
This is an API consolidation only. The use of kmalloc + memset to 0
is equivalent to kcalloc in this case as it is allocating an array
of elements.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ibm/ibmveth.c

index 6691b5a45b9d9be2ba99ec4d5ee15edac1148d5d..335417b4756b73d3d2d9f1558b10b2556443bee7 100644 (file)
@@ -169,7 +169,7 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
        if (!pool->free_map)
                return -1;
 
-       pool->dma_addr = kmalloc(sizeof(dma_addr_t) * pool->size, GFP_KERNEL);
+       pool->dma_addr = kcalloc(pool->size, sizeof(dma_addr_t), GFP_KERNEL);
        if (!pool->dma_addr) {
                kfree(pool->free_map);
                pool->free_map = NULL;
@@ -187,8 +187,6 @@ static int ibmveth_alloc_buffer_pool(struct ibmveth_buff_pool *pool)
                return -1;
        }
 
-       memset(pool->dma_addr, 0, sizeof(dma_addr_t) * pool->size);
-
        for (i = 0; i < pool->size; ++i)
                pool->free_map[i] = i;