From: Chaehyun Lim <chaehyun.lim@gmail.com>
Date: Tue, 22 Sep 2015 13:47:41 +0000 (+0900)
Subject: staging: wilc1000: replace kmalloc_array/memset with kcalloc
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d0a7fcc7e6978051fc38ae885ab5fd8bc9d6b281;p=deliverable%2Flinux.git

staging: wilc1000: replace kmalloc_array/memset with kcalloc

This patch replaces kmalloc_array followed by memset with kcalloc.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 875b769d95a9..8b56b92b5503 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -644,13 +644,11 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ
 		}
 	}
 
-	pstrSurveyResults = kmalloc_array(u32SurveyResultsCount,
-				sizeof(wid_site_survey_reslts_s), GFP_KERNEL);
+	pstrSurveyResults = kcalloc(u32SurveyResultsCount,
+				    sizeof(wid_site_survey_reslts_s), GFP_KERNEL);
 	if (!pstrSurveyResults)
 		return -ENOMEM;
 
-	memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));
-
 	u32SurveyResultsCount = 0;
 
 	for (i = 0; i < u32RcvdSurveyResultsNum; i++) {