Merge tag 'for-linus-20180616' of git://git.kernel.dk/linux-block

[linux.git] / drivers / net / ethernet / qlogic / qed / qed_dev.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index b285edc8d6a10ae48e522b1619443934a84176dc..329781cda77fbecc88328ea95f00e39d4be5db9b 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -814,26 +814,26 @@ static int qed_alloc_qm_data(struct qed_hwfn *p_hwfn)
        if (rc)
                goto alloc_err;
 
-       qm_info->qm_pq_params = kzalloc(sizeof(*qm_info->qm_pq_params) *
-                                       qed_init_qm_get_num_pqs(p_hwfn),
+       qm_info->qm_pq_params = kcalloc(qed_init_qm_get_num_pqs(p_hwfn),
+                                       sizeof(*qm_info->qm_pq_params),
                                        GFP_KERNEL);
        if (!qm_info->qm_pq_params)
                goto alloc_err;
 
-       qm_info->qm_vport_params = kzalloc(sizeof(*qm_info->qm_vport_params) *
-                                          qed_init_qm_get_num_vports(p_hwfn),
+       qm_info->qm_vport_params = kcalloc(qed_init_qm_get_num_vports(p_hwfn),
+                                          sizeof(*qm_info->qm_vport_params),
                                           GFP_KERNEL);
        if (!qm_info->qm_vport_params)
                goto alloc_err;
 
-       qm_info->qm_port_params = kzalloc(sizeof(*qm_info->qm_port_params) *
-                                         p_hwfn->cdev->num_ports_in_engine,
+       qm_info->qm_port_params = kcalloc(p_hwfn->cdev->num_ports_in_engine,
+                                         sizeof(*qm_info->qm_port_params),
                                          GFP_KERNEL);
        if (!qm_info->qm_port_params)
                goto alloc_err;
 
-       qm_info->wfq_data = kzalloc(sizeof(*qm_info->wfq_data) *
-                                   qed_init_qm_get_num_vports(p_hwfn),
+       qm_info->wfq_data = kcalloc(qed_init_qm_get_num_vports(p_hwfn),
+                                   sizeof(*qm_info->wfq_data),
                                    GFP_KERNEL);
        if (!qm_info->wfq_data)
                goto alloc_err;