openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/of' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-samsung

This commit is contained in:
Mark Brown 2018-03-12 11:02:30 -07:00
parent d9e575127b 946857636d
commit 3600cd78d7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc.h
View File

@ -1807,6 +1807,7 @@ int snd_soc_of_get_dai_name(struct device_node *of_node,
int snd_soc_of_get_dai_link_codecs(struct device *dev, int snd_soc_of_get_dai_link_codecs(struct device *dev,
struct device_node *of_node, struct device_node *of_node,
struct snd_soc_dai_link *dai_link); struct snd_soc_dai_link *dai_link);
void snd_soc_of_put_dai_link_codecs(struct snd_soc_dai_link *dai_link);
int snd_soc_add_dai_link(struct snd_soc_card *card, int snd_soc_add_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link); struct snd_soc_dai_link *dai_link);

32
sound/soc/soc-core.c
View File

@ -4392,6 +4392,26 @@ int snd_soc_of_get_dai_name(struct device_node *of_node,
} }
EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_name); EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_name);
/*
* snd_soc_of_put_dai_link_codecs - Dereference device nodes in the codecs array
* @dai_link: DAI link
*
* Dereference device nodes acquired by snd_soc_of_get_dai_link_codecs().
*/
void snd_soc_of_put_dai_link_codecs(struct snd_soc_dai_link *dai_link)
{
struct snd_soc_dai_link_component *component = dai_link->codecs;
int index;
for (index = 0; index < dai_link->num_codecs; index++, component++) {
if (!component->of_node)
break;
of_node_put(component->of_node);
component->of_node = NULL;
}
}
EXPORT_SYMBOL_GPL(snd_soc_of_put_dai_link_codecs);
/* /*
* snd_soc_of_get_dai_link_codecs - Parse a list of CODECs in the devicetree * snd_soc_of_get_dai_link_codecs - Parse a list of CODECs in the devicetree
* @dev: Card device * @dev: Card device
@ -4401,7 +4421,8 @@ EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_name);
* Builds an array of CODEC DAI components from the DAI link property * Builds an array of CODEC DAI components from the DAI link property
* 'sound-dai'. * 'sound-dai'.
* The array is set in the DAI link and the number of DAIs is set accordingly. * The array is set in the DAI link and the number of DAIs is set accordingly.
* The device nodes in the array (of_node) must be dereferenced by the caller. * The device nodes in the array (of_node) must be dereferenced by calling
* snd_soc_of_put_dai_link_codecs() on @dai_link.
* *
* Returns 0 for success * Returns 0 for success
*/ */
@ -4449,14 +4470,7 @@ int snd_soc_of_get_dai_link_codecs(struct device *dev,
} }
return 0; return 0;
err: err:
for (index = 0, component = dai_link->codecs; snd_soc_of_put_dai_link_codecs(dai_link);
index < dai_link->num_codecs;
index++, component++) {
if (!component->of_node)
break;
of_node_put(component->of_node);
component->of_node = NULL;
}
dai_link->codecs = NULL; dai_link->codecs = NULL;
dai_link->num_codecs = 0; dai_link->num_codecs = 0;
return ret; return ret;