diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-17 01:51:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-17 01:51:54 +0300 |
| commit | 94c3a83ad3091a9c9a4da019bd7df6f1dff6a375 (patch) | |
| tree | 05e5e1fac7fbe75668a0c2cbcf3d32bc0519ba6c | |
| parent | 5f52d4dda5bcfc37fba8338bd578ab1bd449f8bd (diff) | |
| parent | 95ce82ac3c476688e3cf81ab04f9c5ac0a31e5ae (diff) | |
| download | linux-94c3a83ad3091a9c9a4da019bd7df6f1dff6a375.tar.xz | |
Merge series "ALSA: hda: export snd_hda_codec_cleanup()" from Kai Vehmanen <kai.vehmanen@linux.intel.com>:
Hi,
this small series is preparation for a set of bugfix ASoC patches
addressing a memleak at module unload for the HDA codec wrapper.
Instead of duplicating HDA code in ASoC tree, I chose to export
more functionality from hda_codec.c so it can be (re)used in ASoC's
hdac_hda.c.
Full series:
https://github.com/thesofproject/linux/pull/2252
Takashi and Mark, feedback is welcome on how to best handle this
kind of series where I have dependent patches both in sound/pci/hda
and in ASoC. For this series, I'm sending the patches separately
and when/if first set is merged by Takashi, I'll route the ASoC
patches via our usually SOF set to Mark.
Kai Vehmanen (2):
ALSA: hda: export snd_hda_codec_cleanup_for_unbind()
ALSA: hda: fix snd_hda_codec_cleanup() documentation
include/sound/hda_codec.h | 2 ++
sound/pci/hda/hda_codec.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
--
2.27.0
| -rw-r--r-- | include/sound/hda_codec.h | 2 | ||||
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/sound/hda_codec.h b/include/sound/hda_codec.h index d16a4229209b..e378ed7f4824 100644 --- a/include/sound/hda_codec.h +++ b/include/sound/hda_codec.h @@ -415,6 +415,8 @@ __printf(2, 3) struct hda_pcm *snd_hda_codec_pcm_new(struct hda_codec *codec, const char *fmt, ...); +void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec); + static inline void snd_hda_codec_pcm_get(struct hda_pcm *pcm) { kref_get(&pcm->kref); diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 7e3ae4534df9..3576e2d8452f 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -792,6 +792,7 @@ void snd_hda_codec_cleanup_for_unbind(struct hda_codec *codec) remove_conn_list(codec); snd_hdac_regmap_exit(&codec->core); } +EXPORT_SYMBOL_GPL(snd_hda_codec_cleanup_for_unbind); static unsigned int hda_set_power_state(struct hda_codec *codec, unsigned int power_state); @@ -3178,7 +3179,7 @@ int snd_hda_codec_prepare(struct hda_codec *codec, EXPORT_SYMBOL_GPL(snd_hda_codec_prepare); /** - * snd_hda_codec_cleanup - Prepare a stream + * snd_hda_codec_cleanup - Clean up stream resources * @codec: the HDA codec * @hinfo: PCM information * @substream: PCM substream |