From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757269AbaDHUmj (ORCPT ); Tue, 8 Apr 2014 16:42:39 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:38784 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756713AbaDHUmf (ORCPT ); Tue, 8 Apr 2014 16:42:35 -0400 From: Matei Oprea To: jbottomley@parallels.com Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Matei Oprea , ROSEdu Kernel Community Subject: [PATCH] scsi: lpfc: lpfc_init: use kcalloc for allocating memory Date: Tue, 8 Apr 2014 23:42:26 +0300 Message-Id: <1396989746-29647-1-git-send-email-eu@opreamatei.ro> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's easier to use kcalloc for allocating arrays. While at it also remove useless casting value. Signed-off-by: Matei Oprea Cc: ROSEdu Kernel Community --- drivers/scsi/lpfc/lpfc_init.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 635eeb3..1528f34 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -4742,12 +4742,14 @@ lpfc_sli_driver_resource_setup(struct lpfc_hba *phba) phba->cfg_sg_seg_cnt = LPFC_DEFAULT_MENLO_SG_SEG_CNT; } - if (!phba->sli.ring) - phba->sli.ring = (struct lpfc_sli_ring *) - kzalloc(LPFC_SLI3_MAX_RING * - sizeof(struct lpfc_sli_ring), GFP_KERNEL); - if (!phba->sli.ring) - return -ENOMEM; + if (unlikely(!phba->sli.ring)) { + phba->sli.ring = kcalloc(LPFC_SLI3_MAX_RING, + sizeof(struct lpfc_sli_ring), + GFP_KERNEL); + + if (!phba->sli.ring) + return -ENOMEM; + } /* * Since lpfc_sg_seg_cnt is module parameter, the sg_dma_buf_size -- 1.9.1