From d007a64c4bfd9ca44345b66074a018440f7dfe3c Mon Sep 17 00:00:00 2001 From: Kunlei Zhang Date: Wed, 2 Mar 2022 11:20:59 +0800 Subject: [PATCH] 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 --- asoc/codecs/wsa883x/wsa883x.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/asoc/codecs/wsa883x/wsa883x.c b/asoc/codecs/wsa883x/wsa883x.c index 1ad6d06dd2..01cfd5ad1d 100644 --- a/asoc/codecs/wsa883x/wsa883x.c +++ b/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);