diff options
author | Mark Brown <broonie@kernel.org> | 2020-06-15 18:15:44 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-06-15 18:15:44 +0300 |
commit | 17212e7188783de75d2a1226c32d3fd7af96ad5d (patch) | |
tree | 08f4b2db5bcfba848dbb6d951cfecdf23b134e98 /include/sound/soc.h | |
parent | b3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff) | |
parent | 4036d05c38ca2f73c2ca182c3ebf0dfd066593a6 (diff) | |
download | linux-17212e7188783de75d2a1226c32d3fd7af96ad5d.tar.xz |
Merge existing fixes from asoc/for-5.8
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r-- | include/sound/soc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index ef5dd28e10a9..2756f9bcac3e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -444,6 +444,8 @@ int devm_snd_soc_register_component(struct device *dev, const struct snd_soc_component_driver *component_driver, struct snd_soc_dai_driver *dai_drv, int num_dai); void snd_soc_unregister_component(struct device *dev); +struct snd_soc_component *snd_soc_lookup_component_nolocked(struct device *dev, + const char *driver_name); struct snd_soc_component *snd_soc_lookup_component(struct device *dev, const char *driver_name); @@ -1361,6 +1363,10 @@ void snd_soc_remove_pcm_runtime(struct snd_soc_card *card, struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, struct snd_soc_dai_driver *dai_drv, bool legacy_dai_naming); +struct snd_soc_dai *devm_snd_soc_register_dai(struct device *dev, + struct snd_soc_component *component, + struct snd_soc_dai_driver *dai_drv, + bool legacy_dai_naming); void snd_soc_unregister_dai(struct snd_soc_dai *dai); struct snd_soc_dai *snd_soc_find_dai( |