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

16
asoc/codecs/wsa883x/wsa883x.c
View File

@@ -1643,7 +1643,6 @@ static int wsa883x_swr_probe(struct swr_device *pdev)
bool pin_state_current = false;
struct wsa_ctrl_platform_data *plat_data = NULL;
struct snd_soc_component *component;
const char *wsa883x_name_prefix_of = NULL;
char buffer[MAX_NAME_LEN];
int dev_index = 0;
@@ -1763,16 +1762,6 @@ static int wsa883x_swr_probe(struct swr_device *pdev)
wcd_disable_irq(&wsa883x->irq_info, WSA883X_IRQ_INT_PA_ON_ERR);
ret = of_property_read_string(pdev->dev.of_node, "qcom,wsa-prefix",
&wsa883x_name_prefix_of);
if (ret) {
dev_err(&pdev->dev,
"%s: Looking up %s property in node %s failed\n",
__func__, "qcom,wsa-prefix",
pdev->dev.of_node->full_name);
goto err_irq;
}
wsa883x->driver = devm_kzalloc(&pdev->dev,
sizeof(struct snd_soc_component_driver), GFP_KERNEL);
if (!wsa883x->driver) {
@@ -1813,15 +1802,12 @@ static int wsa883x_swr_probe(struct swr_device *pdev)
ret = snd_soc_register_component(&pdev->dev,
wsa883x->driver, wsa883x->dai_driver, 1);
wsa883x->wsa883x_name_prefix = kstrndup(wsa883x_name_prefix_of,
strlen(wsa883x_name_prefix_of), GFP_KERNEL);
component = snd_soc_lookup_component(&pdev->dev, wsa883x->driver->name);
if (!component) {
dev_err(&pdev->dev, "%s: component is NULL \n", __func__);
ret = -EINVAL;
goto err_mem;
}
component->name_prefix = wsa883x->wsa883x_name_prefix;
wsa883x->parent_np = of_parse_phandle(pdev->dev.of_node,
"qcom,bolero-handle", 0);
@@ -1891,7 +1877,6 @@ static int wsa883x_swr_probe(struct swr_device *pdev)
return 0;
err_mem:
kfree(wsa883x->wsa883x_name_prefix);
if (wsa883x->dai_driver) {
kfree(wsa883x->dai_driver->name);
kfree(wsa883x->dai_driver->playback.stream_name);
@@ -1956,7 +1941,6 @@ static int wsa883x_swr_remove(struct swr_device *pdev)
#endif
mutex_destroy(&wsa883x->res_lock);
snd_soc_unregister_component(&pdev->dev);
kfree(wsa883x->wsa883x_name_prefix);
if (wsa883x->dai_driver) {
kfree(wsa883x->dai_driver->name);
kfree(wsa883x->dai_driver->playback.stream_name);