Unverified Commit f95cc5c1 authored by Xu Wang's avatar Xu Wang Committed by Mark Brown
Browse files

ASoC: fsl: imx-audmix: Use devm_kcalloc() instead of devm_kzalloc() 



A multiplication for the size determination of a memory allocation
indicated that an array data structure should be processed.
Thus use the corresponding function "devm_kcalloc".

Signed-off-by: default avatarXu Wang <vulab@iscas.ac.cn>
Link: https://lore.kernel.org/r/20200921015918.24157-1-vulab@iscas.ac.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ff1d9ff4

sound/soc/fsl/imx-audmix.c

+4 −4
Original line number Diff line number Diff line
@@ -185,20 +185,20 @@ static int imx_audmix_probe(struct platform_device *pdev) 
		return -ENOMEM;



	priv->num_dai = 2 * num_dai;

	priv->dai = devm_kzalloc(&pdev->dev, priv->num_dai *

	priv->dai = devm_kcalloc(&pdev->dev, priv->num_dai,

				 sizeof(struct snd_soc_dai_link), GFP_KERNEL);

	if (!priv->dai)

		return -ENOMEM;



	priv->num_dai_conf = num_dai;

	priv->dai_conf = devm_kzalloc(&pdev->dev, priv->num_dai_conf *

	priv->dai_conf = devm_kcalloc(&pdev->dev, priv->num_dai_conf,

				      sizeof(struct snd_soc_codec_conf),

				      GFP_KERNEL);

	if (!priv->dai_conf)

		return -ENOMEM;



	priv->num_dapm_routes = 3 * num_dai;

	priv->dapm_routes = devm_kzalloc(&pdev->dev, priv->num_dapm_routes *

	priv->dapm_routes = devm_kcalloc(&pdev->dev, priv->num_dapm_routes,

					 sizeof(struct snd_soc_dapm_route),

					 GFP_KERNEL);

	if (!priv->dapm_routes)
@@ -208,7 +208,7 @@ static int imx_audmix_probe(struct platform_device *pdev) 
		struct snd_soc_dai_link_component *dlc;



		/* for CPU/Codec/Platform x 2 */

		dlc = devm_kzalloc(&pdev->dev, 6 * sizeof(*dlc), GFP_KERNEL);

		dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL);

		if (!dlc) {

			dev_err(&pdev->dev, "failed to allocate dai_link\n");

			return -ENOMEM;

CRA Git | Maintained and supported by SUSTech CRA and CCSE