gve: Use kvcalloc() instead of kvzalloc()

Use 2-factor argument form kvcalloc() instead of kvzalloc().

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 099a2bc5ae6704553516561106a0bb6822fdb8e4..cd9df68cc01ec30888ce685743a705669133dde2 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -268,7 +268,7 @@ static int gve_alloc_notify_blocks(struct gve_priv *priv)
        int i, j;
        int err;
 
-       priv->msix_vectors = kvzalloc(num_vecs_requested *
+       priv->msix_vectors = kvcalloc(num_vecs_requested,
                                      sizeof(*priv->msix_vectors), GFP_KERNEL);
        if (!priv->msix_vectors)
                return -ENOMEM;
@@ -628,7 +628,7 @@ static int gve_alloc_rings(struct gve_priv *priv)
        int err;
 
        /* Setup tx rings */
-       priv->tx = kvzalloc(priv->tx_cfg.num_queues * sizeof(*priv->tx),
+       priv->tx = kvcalloc(priv->tx_cfg.num_queues, sizeof(*priv->tx),
                            GFP_KERNEL);
        if (!priv->tx)
                return -ENOMEM;
@@ -641,7 +641,7 @@ static int gve_alloc_rings(struct gve_priv *priv)
                goto free_tx;
 
        /* Setup rx rings */
-       priv->rx = kvzalloc(priv->rx_cfg.num_queues * sizeof(*priv->rx),
+       priv->rx = kvcalloc(priv->rx_cfg.num_queues, sizeof(*priv->rx),
                            GFP_KERNEL);
        if (!priv->rx) {
                err = -ENOMEM;
@@ -764,12 +764,11 @@ static int gve_alloc_queue_page_list(struct gve_priv *priv, u32 id,
 
        qpl->id = id;
        qpl->num_entries = 0;
-       qpl->pages = kvzalloc(pages * sizeof(*qpl->pages), GFP_KERNEL);
+       qpl->pages = kvcalloc(pages, sizeof(*qpl->pages), GFP_KERNEL);
        /* caller handles clean up */
        if (!qpl->pages)
                return -ENOMEM;
-       qpl->page_buses = kvzalloc(pages * sizeof(*qpl->page_buses),
-                                  GFP_KERNEL);
+       qpl->page_buses = kvcalloc(pages, sizeof(*qpl->page_buses), GFP_KERNEL);
        /* caller handles clean up */
        if (!qpl->page_buses)
                return -ENOMEM;
@@ -828,7 +827,7 @@ static int gve_alloc_qpls(struct gve_priv *priv)
        if (priv->queue_format == GVE_GQI_RDA_FORMAT)
                return 0;
 
-       priv->qpls = kvzalloc(num_qpls * sizeof(*priv->qpls), GFP_KERNEL);
+       priv->qpls = kvcalloc(num_qpls, sizeof(*priv->qpls), GFP_KERNEL);
        if (!priv->qpls)
                return -ENOMEM;
 
@@ -847,7 +846,7 @@ static int gve_alloc_qpls(struct gve_priv *priv)
 
        priv->qpl_cfg.qpl_map_size = BITS_TO_LONGS(num_qpls) *
                                     sizeof(unsigned long) * BITS_PER_BYTE;
-       priv->qpl_cfg.qpl_id_map = kvzalloc(BITS_TO_LONGS(num_qpls) *
+       priv->qpl_cfg.qpl_id_map = kvcalloc(BITS_TO_LONGS(num_qpls),
                                            sizeof(unsigned long), GFP_KERNEL);
        if (!priv->qpl_cfg.qpl_id_map) {
                err = -ENOMEM;