treewide: kzalloc() -> kcalloc()

[linux-2.6-microblaze.git] / drivers / scsi / lpfc / lpfc_sli.c

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 4b70d53..6f3c00a 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1720,7 +1720,7 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
                                           - LPFC_IOCBQ_LOOKUP_INCREMENT)) {
                new_len = psli->iocbq_lookup_len + LPFC_IOCBQ_LOOKUP_INCREMENT;
                spin_unlock_irq(&phba->hbalock);
-               new_arr = kzalloc(new_len * sizeof (struct lpfc_iocbq *),
+               new_arr = kcalloc(new_len, sizeof(struct lpfc_iocbq *),
                                  GFP_KERNEL);
                if (new_arr) {
                        spin_lock_irq(&phba->hbalock);
@@ -5142,16 +5142,17 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                 */
                if ((phba->vpi_bmask == NULL) && (phba->vpi_ids == NULL)) {
                        longs = (phba->max_vpi + BITS_PER_LONG) / BITS_PER_LONG;
-                       phba->vpi_bmask = kzalloc(longs * sizeof(unsigned long),
+                       phba->vpi_bmask = kcalloc(longs,
+                                                 sizeof(unsigned long),
                                                  GFP_KERNEL);
                        if (!phba->vpi_bmask) {
                                rc = -ENOMEM;
                                goto lpfc_sli_hba_setup_error;
                        }
 
-                       phba->vpi_ids = kzalloc(
-                                       (phba->max_vpi+1) * sizeof(uint16_t),
-                                       GFP_KERNEL);
+                       phba->vpi_ids = kcalloc(phba->max_vpi + 1,
+                                               sizeof(uint16_t),
+                                               GFP_KERNEL);
                        if (!phba->vpi_ids) {
                                kfree(phba->vpi_bmask);
                                rc = -ENOMEM;
@@ -5836,14 +5837,14 @@ lpfc_sli4_alloc_extent(struct lpfc_hba *phba, uint16_t type)
        length = sizeof(struct lpfc_rsrc_blks);
        switch (type) {
        case LPFC_RSC_TYPE_FCOE_RPI:
-               phba->sli4_hba.rpi_bmask = kzalloc(longs *
+               phba->sli4_hba.rpi_bmask = kcalloc(longs,
                                                   sizeof(unsigned long),
                                                   GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.rpi_bmask)) {
                        rc = -ENOMEM;
                        goto err_exit;
                }
-               phba->sli4_hba.rpi_ids = kzalloc(rsrc_id_cnt *
+               phba->sli4_hba.rpi_ids = kcalloc(rsrc_id_cnt,
                                                 sizeof(uint16_t),
                                                 GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.rpi_ids)) {
@@ -5865,15 +5866,13 @@ lpfc_sli4_alloc_extent(struct lpfc_hba *phba, uint16_t type)
                ext_blk_list = &phba->sli4_hba.lpfc_rpi_blk_list;
                break;
        case LPFC_RSC_TYPE_FCOE_VPI:
-               phba->vpi_bmask = kzalloc(longs *
-                                         sizeof(unsigned long),
+               phba->vpi_bmask = kcalloc(longs, sizeof(unsigned long),
                                          GFP_KERNEL);
                if (unlikely(!phba->vpi_bmask)) {
                        rc = -ENOMEM;
                        goto err_exit;
                }
-               phba->vpi_ids = kzalloc(rsrc_id_cnt *
-                                        sizeof(uint16_t),
+               phba->vpi_ids = kcalloc(rsrc_id_cnt, sizeof(uint16_t),
                                         GFP_KERNEL);
                if (unlikely(!phba->vpi_ids)) {
                        kfree(phba->vpi_bmask);
@@ -5887,7 +5886,7 @@ lpfc_sli4_alloc_extent(struct lpfc_hba *phba, uint16_t type)
                ext_blk_list = &phba->lpfc_vpi_blk_list;
                break;
        case LPFC_RSC_TYPE_FCOE_XRI:
-               phba->sli4_hba.xri_bmask = kzalloc(longs *
+               phba->sli4_hba.xri_bmask = kcalloc(longs,
                                                   sizeof(unsigned long),
                                                   GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.xri_bmask)) {
@@ -5895,7 +5894,7 @@ lpfc_sli4_alloc_extent(struct lpfc_hba *phba, uint16_t type)
                        goto err_exit;
                }
                phba->sli4_hba.max_cfg_param.xri_used = 0;
-               phba->sli4_hba.xri_ids = kzalloc(rsrc_id_cnt *
+               phba->sli4_hba.xri_ids = kcalloc(rsrc_id_cnt,
                                                 sizeof(uint16_t),
                                                 GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.xri_ids)) {
@@ -5910,14 +5909,14 @@ lpfc_sli4_alloc_extent(struct lpfc_hba *phba, uint16_t type)
                ext_blk_list = &phba->sli4_hba.lpfc_xri_blk_list;
                break;
        case LPFC_RSC_TYPE_FCOE_VFI:
-               phba->sli4_hba.vfi_bmask = kzalloc(longs *
+               phba->sli4_hba.vfi_bmask = kcalloc(longs,
                                                   sizeof(unsigned long),
                                                   GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.vfi_bmask)) {
                        rc = -ENOMEM;
                        goto err_exit;
                }
-               phba->sli4_hba.vfi_ids = kzalloc(rsrc_id_cnt *
+               phba->sli4_hba.vfi_ids = kcalloc(rsrc_id_cnt,
                                                 sizeof(uint16_t),
                                                 GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.vfi_ids)) {
@@ -6250,15 +6249,14 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
                }
                base = phba->sli4_hba.max_cfg_param.rpi_base;
                longs = (count + BITS_PER_LONG - 1) / BITS_PER_LONG;
-               phba->sli4_hba.rpi_bmask = kzalloc(longs *
+               phba->sli4_hba.rpi_bmask = kcalloc(longs,
                                                   sizeof(unsigned long),
                                                   GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.rpi_bmask)) {
                        rc = -ENOMEM;
                        goto err_exit;
                }
-               phba->sli4_hba.rpi_ids = kzalloc(count *
-                                                sizeof(uint16_t),
+               phba->sli4_hba.rpi_ids = kcalloc(count, sizeof(uint16_t),
                                                 GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.rpi_ids)) {
                        rc = -ENOMEM;
@@ -6279,15 +6277,13 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
                }
                base = phba->sli4_hba.max_cfg_param.vpi_base;
                longs = (count + BITS_PER_LONG - 1) / BITS_PER_LONG;
-               phba->vpi_bmask = kzalloc(longs *
-                                         sizeof(unsigned long),
+               phba->vpi_bmask = kcalloc(longs, sizeof(unsigned long),
                                          GFP_KERNEL);
                if (unlikely(!phba->vpi_bmask)) {
                        rc = -ENOMEM;
                        goto free_rpi_ids;
                }
-               phba->vpi_ids = kzalloc(count *
-                                       sizeof(uint16_t),
+               phba->vpi_ids = kcalloc(count, sizeof(uint16_t),
                                        GFP_KERNEL);
                if (unlikely(!phba->vpi_ids)) {
                        rc = -ENOMEM;
@@ -6308,7 +6304,7 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
                }
                base = phba->sli4_hba.max_cfg_param.xri_base;
                longs = (count + BITS_PER_LONG - 1) / BITS_PER_LONG;
-               phba->sli4_hba.xri_bmask = kzalloc(longs *
+               phba->sli4_hba.xri_bmask = kcalloc(longs,
                                                   sizeof(unsigned long),
                                                   GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.xri_bmask)) {
@@ -6316,8 +6312,7 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
                        goto free_vpi_ids;
                }
                phba->sli4_hba.max_cfg_param.xri_used = 0;
-               phba->sli4_hba.xri_ids = kzalloc(count *
-                                                sizeof(uint16_t),
+               phba->sli4_hba.xri_ids = kcalloc(count, sizeof(uint16_t),
                                                 GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.xri_ids)) {
                        rc = -ENOMEM;
@@ -6338,15 +6333,14 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba)
                }
                base = phba->sli4_hba.max_cfg_param.vfi_base;
                longs = (count + BITS_PER_LONG - 1) / BITS_PER_LONG;
-               phba->sli4_hba.vfi_bmask = kzalloc(longs *
+               phba->sli4_hba.vfi_bmask = kcalloc(longs,
                                                   sizeof(unsigned long),
                                                   GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.vfi_bmask)) {
                        rc = -ENOMEM;
                        goto free_xri_ids;
                }
-               phba->sli4_hba.vfi_ids = kzalloc(count *
-                                                sizeof(uint16_t),
+               phba->sli4_hba.vfi_ids = kcalloc(count, sizeof(uint16_t),
                                                 GFP_KERNEL);
                if (unlikely(!phba->sli4_hba.vfi_ids)) {
                        rc = -ENOMEM;