ethernet: ucc_geth: replace kmalloc_array()+for loop by kcalloc()

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 1e9d2f3f47a33ef270f1ea9cbd71dd98c3c0a796..621a9e3e4b65aa4cb85380cb9706c3488a056bdb 100644 (file)
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -2203,8 +2203,8 @@ static int ucc_geth_alloc_tx(struct ucc_geth_private *ugeth)
        for (j = 0; j < ug_info->numQueuesTx; j++) {
                /* Setup the skbuff rings */
                ugeth->tx_skbuff[j] =
-                       kmalloc_array(ugeth->ug_info->bdRingLenTx[j],
-                                     sizeof(struct sk_buff *), GFP_KERNEL);
+                       kcalloc(ugeth->ug_info->bdRingLenTx[j],
+                               sizeof(struct sk_buff *), GFP_KERNEL);
 
                if (ugeth->tx_skbuff[j] == NULL) {
                        if (netif_msg_ifup(ugeth))
@@ -2212,9 +2212,6 @@ static int ucc_geth_alloc_tx(struct ucc_geth_private *ugeth)
                        return -ENOMEM;
                }
 
-               for (i = 0; i < ugeth->ug_info->bdRingLenTx[j]; i++)
-                       ugeth->tx_skbuff[j][i] = NULL;
-
                ugeth->skb_curtx[j] = ugeth->skb_dirtytx[j] = 0;
                bd = ugeth->confBd[j] = ugeth->txBd[j] = ugeth->p_tx_bd_ring[j];
                for (i = 0; i < ug_info->bdRingLenTx[j]; i++) {
@@ -2266,8 +2263,8 @@ static int ucc_geth_alloc_rx(struct ucc_geth_private *ugeth)
        for (j = 0; j < ug_info->numQueuesRx; j++) {
                /* Setup the skbuff rings */
                ugeth->rx_skbuff[j] =
-                       kmalloc_array(ugeth->ug_info->bdRingLenRx[j],
-                                     sizeof(struct sk_buff *), GFP_KERNEL);
+                       kcalloc(ugeth->ug_info->bdRingLenRx[j],
+                               sizeof(struct sk_buff *), GFP_KERNEL);
 
                if (ugeth->rx_skbuff[j] == NULL) {
                        if (netif_msg_ifup(ugeth))
@@ -2275,9 +2272,6 @@ static int ucc_geth_alloc_rx(struct ucc_geth_private *ugeth)
                        return -ENOMEM;
                }
 
-               for (i = 0; i < ugeth->ug_info->bdRingLenRx[j]; i++)
-                       ugeth->rx_skbuff[j][i] = NULL;
-
                ugeth->skb_currx[j] = 0;
                bd = ugeth->rxBd[j] = ugeth->p_rx_bd_ring[j];
                for (i = 0; i < ug_info->bdRingLenRx[j]; i++) {