samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: update cpu_dai_name references

Browse Source 
From 5.4 kernel, cpu_dai_name is replaced by a
pointer to snd_soc_dai_link_component which holds the
dai name, update such references.

Change-Id: I5ddda0232b75cee7c0f2dc937102e1342a50276a
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
This commit is contained in:
Vignesh Kulothungan
2019-12-23 17:51:27 -08:00
committed by Meng Wang
parent d71ec81bb0
commit 0db3d6b206
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
asoc/msm-compress-q6-v2.c
View File

@@ -1680,7 +1680,7 @@ static int msm_compr_playback_open(struct snd_compr_stream *cstream)
pdata = snd_soc_component_get_drvdata(component); pdata = snd_soc_component_get_drvdata(component);
if (pdata->is_in_use[rtd->dai_link->id] == true) { if (pdata->is_in_use[rtd->dai_link->id] == true) {
pr_err("%s: %s is already in use, err: %d\n", 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; 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", 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, __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 + ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1 +
strlen(suffix) + 1; strlen(suffix) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); 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", 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, __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; ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); 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", 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, __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; ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); mixer_str = kzalloc(ctl_len, GFP_KERNEL);
if (!mixer_str) { 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", 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, __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 + ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1 +
strlen(suffix) + 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", 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, __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) if (rtd->compr->direction == SND_COMPRESS_PLAYBACK)
ctl_len = strlen(playback_mixer_ctl_name) + 1 + strlen(deviceNo) ctl_len = strlen(playback_mixer_ctl_name) + 1 + strlen(deviceNo)
+ 1 + strlen(suffix) + 1; + 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", 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, __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; ctl_len = strlen(mixer_ctl_name) + strlen(deviceNo) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); mixer_str = kzalloc(ctl_len, GFP_KERNEL);

2
asoc/msm-pcm-q6-noirq.c
View File

@@ -928,7 +928,7 @@ static int msm_pcm_add_channel_map_control(struct snd_soc_pcm_runtime *rtd)
pr_debug("%s: added new pcm FE with name %s, id %d, cpu dai %s, device no %d\n", pr_debug("%s: added new pcm FE with name %s, id %d, cpu dai %s, device no %d\n",
__func__, rtd->dai_link->name, rtd->dai_link->id, __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; ctl_len = strlen(mixer_ctl_name) + strlen(deviceNo) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); mixer_str = kzalloc(ctl_len, GFP_KERNEL);

2
asoc/msm-pcm-q6-v2.c
View File

@@ -1455,7 +1455,7 @@ static int msm_pcm_add_audio_adsp_stream_callback_control(
pr_debug("%s: added new pcm FE with name %s, id %d, cpu dai %s, device no %d\n", pr_debug("%s: added new pcm FE with name %s, id %d, cpu dai %s, device no %d\n",
__func__, rtd->dai_link->name, rtd->dai_link->id, __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; ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); mixer_str = kzalloc(ctl_len, GFP_KERNEL);
if (!mixer_str) { if (!mixer_str) {

2
asoc/msm-transcode-loopback-q6-v2.c
View File

@@ -1211,7 +1211,7 @@ static int msm_transcode_add_audio_effects_control(struct snd_soc_pcm_runtime *r
pr_debug("%s: added new compr FE with name %s, id %d, cpu dai %s, device no %d\n", __func__, 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->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; ctl_len = strlen(mixer_ctl_name) + 1 + strlen(deviceNo) + 1;
mixer_str = kzalloc(ctl_len, GFP_KERNEL); mixer_str = kzalloc(ctl_len, GFP_KERNEL);