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

asoc: use ASoC API to set driver component name prefix

Browse Source 
during devm_snd_soc_register_card(), the name_prefix can be set
if "sound-name-prefix" is provided in the DT nodes.

The original approach to set prefix would possibly cause ASoC
component probe failed if prefix has not set before probe is called

Change-Id: Ie78d042cda24b7d1d926223d476786e13d965ac7
Signed-off-by: Junkai Cai <quic_junkai@quicinc.com>
This commit is contained in:
Junkai Cai
2021-11-11 16:49:50 -08:00
committed by Gerrit - the friendly Code Review server
parent 7795165e0a
commit 97e37eeee3
5 changed files with 1 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
asoc/codecs/swr-dmic.c
View File

@@ -599,9 +599,7 @@ static int swr_dmic_probe(struct swr_device *pdev)
int i = 0;
u8 swr_devnum = 0;
int dev_index = -1;
char* prefix_name = NULL;
struct swr_dmic_priv *swr_dmic = NULL;
const char *swr_dmic_name_prefix_of = NULL;
const char *swr_dmic_codec_name_of = NULL;
struct snd_soc_component *component = NULL;
int num_retry = NUM_ATTEMPTS;
@@ -645,15 +643,6 @@ static int swr_dmic_probe(struct swr_device *pdev)
swr_dmic->swr_slave = pdev;
ret = of_property_read_string(pdev->dev.of_node, "qcom,swr-dmic-prefix",
&swr_dmic_name_prefix_of);
if (ret) {
dev_dbg(&pdev->dev, "%s: Looking up %s property in node %s failed\n",
__func__, "qcom,swr-dmic-prefix",
pdev->dev.of_node->full_name);
goto dev_err;
}
ret = of_property_read_string(pdev->dev.of_node, "qcom,codec-name",
&swr_dmic_codec_name_of);
if (ret) {
@@ -755,16 +744,6 @@ static int swr_dmic_probe(struct swr_device *pdev)
goto dev_err;
}
swr_dmic->component = component;
prefix_name = devm_kzalloc(&pdev->dev,
strlen(swr_dmic_name_prefix_of) + 1,
GFP_KERNEL);
if (!prefix_name) {
ret = -ENOMEM;
goto dev_err;
}
strlcpy(prefix_name, swr_dmic_name_prefix_of,
strlen(prefix_name) + 1);
component->name_prefix = prefix_name;
return 0;