[PATCH 0/2] ALSA: hda: export snd_hda_codec_cleanup()

[PATCH 0/2] ALSA: hda: export snd_hda_codec_cleanup()

[Kai Vehmanen]

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

[PATCH 1/2] ALSA: hda: export snd_hda_codec_cleanup_for_unbind()

[Kai Vehmanen]

To avoid duplicated code for cleanup, and match the already exported
snd_hda_codec_pcm_new(), also export snd_hda_codec_cleanup_for_unbind().

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 include/sound/hda_codec.h | 2 ++
 sound/pci/hda/hda_codec.c | 1 +
 2 files changed, 3 insertions(+)

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..b4331355602c 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);
-- 
2.27.0

[PATCH 2/2] ALSA: hda: fix snd_hda_codec_cleanup() documentation

[Kai Vehmanen]

Fix a copy and paste error in snd_hda_codec_cleanup()
documentation.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
---
 sound/pci/hda/hda_codec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index b4331355602c..3576e2d8452f 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3179,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
-- 
2.27.0

Re: [PATCH 0/2] ALSA: hda: export snd_hda_codec_cleanup()

[Takashi Iwai]

On Wed, 15 Jul 2020 19:45:49 +0200,
Kai Vehmanen wrote:
> 
> 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.

For this kind of small changes, it's fine to merge directly into ASoC
tree.  So feel free to take my ack for both:
Reviewed-by: Takashi Iwai <tiwai@suse.de>


thanks,

Takashi


> 
> 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
> 

Re: [PATCH 0/2] ALSA: hda: export snd_hda_codec_cleanup()

[Kai Vehmanen]

Hi,

On Wed, 15 Jul 2020, Takashi Iwai wrote:

> For this kind of small changes, it's fine to merge directly into ASoC
> tree.  So feel free to take my ack for both:

ack thanks, I'll send the full series via ASoC tree!

Br, Kai

Re: [PATCH 0/2] ALSA: hda: export snd_hda_codec_cleanup()

[Mark Brown]

On Wed, 15 Jul 2020 20:45:49 +0300, Kai Vehmanen wrote:
> 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
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/2] ALSA: hda: export snd_hda_codec_cleanup_for_unbind()
      commit: cc1d0cd817bad5dab50732a6668a87ff3eac3b5c
[2/2] ALSA: hda: fix snd_hda_codec_cleanup() documentation
      commit: 95ce82ac3c476688e3cf81ab04f9c5ac0a31e5ae

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark