commit 4ca7deb1e15e0030d04051cf4285e88249ebe252
author Axel Lin <axel.lin@ingics.com> Wed Aug 05 22:34:22 2015 +0800
committer Mark Brown <broonie@kernel.org> Thu Aug 06 12:35:15 2015 +0100
tree 6361859360aadbc05b35f65667089a5470f84a1b
parent d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754

ASoC: topology: Use kcalloc instead of kzalloc for array allocation

Also remove unnecessary memset.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

sound/soc/soc-topology.c

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index d096068..f038c6e 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1070,7 +1070,7 @@
 	struct snd_soc_tplg_mixer_control *mc;
 	int i, err;
 
-	kc = kzalloc(sizeof(*kc) * num_kcontrols, GFP_KERNEL);
+	kc = kcalloc(num_kcontrols, sizeof(*kc), GFP_KERNEL);
 	if (kc == NULL)
 		return NULL;
 
@@ -1251,7 +1251,7 @@
 	struct snd_kcontrol_new *kc;
 	int i, err;
 
-	kc = kzalloc(sizeof(*kc) * count, GFP_KERNEL);
+	kc = kcalloc(count, sizeof(*kc), GFP_KERNEL);
 	if (!kc)
 		return NULL;
 
@@ -1274,7 +1274,6 @@
 			"ASoC: adding bytes kcontrol %s with access 0x%x\n",
 			be->hdr.name, be->hdr.access);
 
-		memset(kc, 0, sizeof(*kc));
 		kc[i].name = be->hdr.name;
 		kc[i].private_value = (long)sbe;
 		kc[i].iface = SNDRV_CTL_ELEM_IFACE_MIXER;