[PATCH 1/6] ASoC: soc-core: Merge CPU/Codec DAIs

[Pierre-Louis Bossart]

> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 4e0f55555e37..511f6b0cb2e0 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -475,22 +475,22 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
>   	INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work);
>   
>   	/*
> -	 * for rtd->codec_dais
> +	 * for rtd->dais
>   	 */
> -	rtd->codec_dais = devm_kcalloc(dev, dai_link->num_codecs,
> +	rtd->dais = devm_kcalloc(dev, dai_link->num_cpus + dai_link->num_codecs,
>   					sizeof(struct snd_soc_dai *),
>   					GFP_KERNEL);

nit-pick: alignment?