diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-06-15 16:15:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-15 16:15:44 +0100 |
| commit | 17212e7188783de75d2a1226c32d3fd7af96ad5d (patch) | |
| tree | 08f4b2db5bcfba848dbb6d951cfecdf23b134e98 /include/sound | |
| parent | Linux 5.8-rc1 (diff) | |
| parent | Merge series "ASoC: topology: fix use-after-free when removing components" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>: (diff) | |
| download | wireguard-linux-17212e7188783de75d2a1226c32d3fd7af96ad5d.tar.xz wireguard-linux-17212e7188783de75d2a1226c32d3fd7af96ad5d.zip | |
Merge existing fixes from asoc/for-5.8
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/dmaengine_pcm.h | 11 | ||||
| -rw-r--r-- | include/sound/soc.h | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index b65220685920..8c5e38180fb0 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -161,4 +161,15 @@ int snd_dmaengine_pcm_prepare_slave_config(struct snd_pcm_substream *substream, #define SND_DMAENGINE_PCM_DRV_NAME "snd_dmaengine_pcm" +struct dmaengine_pcm { + struct dma_chan *chan[SNDRV_PCM_STREAM_LAST + 1]; + const struct snd_dmaengine_pcm_config *config; + struct snd_soc_component component; + unsigned int flags; +}; + +static inline struct dmaengine_pcm *soc_component_to_pcm(struct snd_soc_component *p) +{ + return container_of(p, struct dmaengine_pcm, component); +} #endif 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( |