Browse Source

asoc: codecs: update WSA dapm_ignore_suspend pin names

Update to 5.15 kernel dapm api.
Pin name no longer needs prefix as it is added in API.

Change-Id: Ibf967dd01a36decdf904eff9d5af2e315aa53f1c
Signed-off-by: Kunlei Zhang <[email protected]>
Kunlei Zhang 3 years ago
parent
commit
d007a64c4b
1 changed files with 4 additions and 9 deletions
  1. 4 9
      asoc/codecs/wsa883x/wsa883x.c

+ 4 - 9
asoc/codecs/wsa883x/wsa883x.c

@@ -1414,25 +1414,20 @@ static int wsa883x_codec_probe(struct snd_soc_component *component)
 	wsa883x->global_pa_cnt = 0;
 
 	memset(w_name, 0, sizeof(w_name));
-	strlcpy(w_name, component->name_prefix, sizeof(w_name));
-	strlcat(w_name, " ", sizeof(w_name));
-	strlcat(w_name, wsa883x->dai_driver->playback.stream_name,
+	strlcpy(w_name, wsa883x->dai_driver->playback.stream_name,
 				sizeof(w_name));
 	snd_soc_dapm_ignore_suspend(dapm, w_name);
 
 	memset(w_name, 0, sizeof(w_name));
-	strlcpy(w_name, component->name_prefix, sizeof(w_name));
-	strlcat(w_name, " IN", sizeof(w_name));
+	strlcpy(w_name, "IN", sizeof(w_name));
 	snd_soc_dapm_ignore_suspend(dapm, w_name);
 
 	memset(w_name, 0, sizeof(w_name));
-	strlcpy(w_name, component->name_prefix, sizeof(w_name));
-	strlcat(w_name, " SWR DAC_Port", sizeof(w_name));
+	strlcpy(w_name, "SWR DAC_Port", sizeof(w_name));
 	snd_soc_dapm_ignore_suspend(dapm, w_name);
 
 	memset(w_name, 0, sizeof(w_name));
-	strlcpy(w_name, component->name_prefix, sizeof(w_name));
-	strlcat(w_name, " SPKR", sizeof(w_name));
+	strlcpy(w_name, "SPKR", sizeof(w_name));
 	snd_soc_dapm_ignore_suspend(dapm, w_name);
 
 	snd_soc_dapm_sync(dapm);