|
@@ -1680,7 +1680,7 @@ static int msm_compr_playback_open(struct snd_compr_stream *cstream)
|
|
|
pdata = snd_soc_component_get_drvdata(component);
|
|
|
if (pdata->is_in_use[rtd->dai_link->id] == true) {
|
|
|
pr_err("%s: %s is already in use, err: %d\n",
|
|
|
- __func__, rtd->dai_link->cpu_dai_name, -EBUSY);
|
|
|
+ __func__, rtd->dai_link->cpus->dai_name, -EBUSY);
|
|
|
return -EBUSY;
|
|
|
}
|
|
|
|
|
@@ -4309,7 +4309,7 @@ static int msm_compr_add_volume_control(struct snd_soc_pcm_runtime *rtd)
|
|
|
|
|
|
pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",
|
|
|
__func__, rtd->dai_link->name, rtd->dai_link->id,
|
|
|
- rtd->dai_link->cpu_dai_name, rtd->pcm->device);
|
|
|
+ rtd->dai_link->cpus->dai_name, rtd->pcm->device);
|
|
|
ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1 +
|
|
|
strlen(suffix) + 1;
|
|
|
mixer_str = kzalloc(ctl_len, GFP_KERNEL);
|
|
@@ -4360,7 +4360,7 @@ static int msm_compr_add_audio_effects_control(struct snd_soc_pcm_runtime *rtd)
|
|
|
|
|
|
pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",
|
|
|
__func__, rtd->dai_link->name, rtd->dai_link->id,
|
|
|
- rtd->dai_link->cpu_dai_name, rtd->pcm->device);
|
|
|
+ rtd->dai_link->cpus->dai_name, rtd->pcm->device);
|
|
|
|
|
|
ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
|
|
|
mixer_str = kzalloc(ctl_len, GFP_KERNEL);
|
|
@@ -4412,7 +4412,7 @@ static int msm_compr_add_query_audio_effect_control(
|
|
|
|
|
|
pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",
|
|
|
__func__, rtd->dai_link->name, rtd->dai_link->id,
|
|
|
- rtd->dai_link->cpu_dai_name, rtd->pcm->device);
|
|
|
+ rtd->dai_link->cpus->dai_name, rtd->pcm->device);
|
|
|
ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
|
|
|
mixer_str = kzalloc(ctl_len, GFP_KERNEL);
|
|
|
if (!mixer_str) {
|
|
@@ -4585,7 +4585,7 @@ static int msm_compr_add_dec_runtime_params_control(
|
|
|
|
|
|
pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",
|
|
|
__func__, rtd->dai_link->name, rtd->dai_link->id,
|
|
|
- rtd->dai_link->cpu_dai_name, rtd->pcm->device);
|
|
|
+ rtd->dai_link->cpus->dai_name, rtd->pcm->device);
|
|
|
|
|
|
ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1 +
|
|
|
strlen(suffix) + 1;
|
|
@@ -4641,7 +4641,7 @@ static int msm_compr_add_app_type_cfg_control(struct snd_soc_pcm_runtime *rtd)
|
|
|
|
|
|
pr_debug("%s: added new compr FE ctl with name %s, id %d, cpu dai %s, device no %d\n",
|
|
|
__func__, rtd->dai_link->name, rtd->dai_link->id,
|
|
|
- rtd->dai_link->cpu_dai_name, rtd->pcm->device);
|
|
|
+ rtd->dai_link->cpus->dai_name, rtd->pcm->device);
|
|
|
if (rtd->compr->direction == SND_COMPRESS_PLAYBACK)
|
|
|
ctl_len = strlen(playback_mixer_ctl_name) + 1 + strlen(deviceNo)
|
|
|
+ 1 + strlen(suffix) + 1;
|
|
@@ -4716,7 +4716,7 @@ static int msm_compr_add_channel_map_control(struct snd_soc_pcm_runtime *rtd)
|
|
|
|
|
|
pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n",
|
|
|
__func__, rtd->dai_link->name, rtd->dai_link->id,
|
|
|
- rtd->dai_link->cpu_dai_name, rtd->pcm->device);
|
|
|
+ rtd->dai_link->cpus->dai_name, rtd->pcm->device);
|
|
|
|
|
|
ctl_len = strlen(mixer_ctl_name) + strlen(deviceNo) + 1;
|
|
|
mixer_str = kzalloc(ctl_len, GFP_KERNEL);
|