Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd0d3bf3 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman
Browse files

ALSA: hda: add snd_hdac_stop_streams() helper 



[ Upstream commit 24ad3835a6db4f8857975effa6bf47730371a5ff ]

Minor code reuse, no functionality change.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20220919121041.43463-6-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Stable-dep-of: 171107237246 ("ASoC: Intel: Skylake: Fix driver hang during shutdown")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d5952155

include/sound/hdaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -555,6 +555,7 @@ int snd_hdac_stream_set_params(struct hdac_stream *azx_dev, 
void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start);

void snd_hdac_stream_clear(struct hdac_stream *azx_dev);

void snd_hdac_stream_stop(struct hdac_stream *azx_dev);

void snd_hdac_stop_streams(struct hdac_bus *bus);

void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus);

void snd_hdac_stream_reset(struct hdac_stream *azx_dev);

void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set,

sound/hda/hdac_stream.c

+14 −3
Original line number Diff line number Diff line
@@ -143,16 +143,27 @@ void snd_hdac_stream_stop(struct hdac_stream *azx_dev) 
EXPORT_SYMBOL_GPL(snd_hdac_stream_stop);



/**

 * snd_hdac_stop_streams_and_chip - stop all streams and chip if running

 * snd_hdac_stop_streams - stop all streams

 * @bus: HD-audio core bus

 */

void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus)

void snd_hdac_stop_streams(struct hdac_bus *bus)

{

	struct hdac_stream *stream;



	if (bus->chip_init) {

	list_for_each_entry(stream, &bus->stream_list, list)

		snd_hdac_stream_stop(stream);

}

EXPORT_SYMBOL_GPL(snd_hdac_stop_streams);



/**

 * snd_hdac_stop_streams_and_chip - stop all streams and chip if running

 * @bus: HD-audio core bus

 */

void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus)

{



	if (bus->chip_init) {

		snd_hdac_stop_streams(bus);

		snd_hdac_bus_stop_chip(bus);

	}

}

sound/pci/hda/hda_controller.c

+1 −3
Original line number Diff line number Diff line
@@ -1093,10 +1093,8 @@ EXPORT_SYMBOL_GPL(azx_init_chip); 
void azx_stop_all_streams(struct azx *chip)

{

	struct hdac_bus *bus = azx_bus(chip);

	struct hdac_stream *s;



	list_for_each_entry(s, &bus->stream_list, list)

		snd_hdac_stream_stop(s);

	snd_hdac_stop_streams(bus);

}

EXPORT_SYMBOL_GPL(azx_stop_all_streams);