mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
ALSA/ASoC: hda: move/rename snd_hdac_ext_stop_streams to hdac_stream.c
snd_hdac_ext_stop_streams() has really nothing to do with the extension, it just loops over the bus streams. Move it to the hdac_stream layer and rename to remove the 'ext' prefix and add the precision that the chip will also be stopped. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20211216231128.344321-2-pierre-louis.bossart@linux.intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
dec242b6a8
commit
12054f0ce8
|
@ -558,6 +558,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_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,
|
||||
unsigned int streams, unsigned int reg);
|
||||
|
|
|
@ -92,7 +92,6 @@ void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus,
|
|||
struct hdac_ext_stream *azx_dev, bool decouple);
|
||||
void snd_hdac_ext_stream_decouple(struct hdac_bus *bus,
|
||||
struct hdac_ext_stream *azx_dev, bool decouple);
|
||||
void snd_hdac_ext_stop_streams(struct hdac_bus *bus);
|
||||
|
||||
int snd_hdac_ext_stream_set_spib(struct hdac_bus *bus,
|
||||
struct hdac_ext_stream *stream, u32 value);
|
||||
|
|
|
@ -475,23 +475,6 @@ int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_bus *bus,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_get_spbmaxfifo);
|
||||
|
||||
|
||||
/**
|
||||
* snd_hdac_ext_stop_streams - stop all stream if running
|
||||
* @bus: HD-audio core bus
|
||||
*/
|
||||
void snd_hdac_ext_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);
|
||||
snd_hdac_bus_stop_chip(bus);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_hdac_ext_stop_streams);
|
||||
|
||||
/**
|
||||
* snd_hdac_ext_stream_drsm_enable - enable DMA resume for a stream
|
||||
* @bus: HD-audio core bus
|
||||
|
|
|
@ -142,6 +142,22 @@ 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
|
||||
* @bus: HD-audio core bus
|
||||
*/
|
||||
void snd_hdac_stop_streams_and_chip(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);
|
||||
snd_hdac_bus_stop_chip(bus);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(snd_hdac_stop_streams_and_chip);
|
||||
|
||||
/**
|
||||
* snd_hdac_stream_reset - reset a stream
|
||||
* @azx_dev: HD-audio core stream to reset
|
||||
|
|
|
@ -439,7 +439,7 @@ static int skl_free(struct hdac_bus *bus)
|
|||
|
||||
skl->init_done = 0; /* to be sure */
|
||||
|
||||
snd_hdac_ext_stop_streams(bus);
|
||||
snd_hdac_stop_streams_and_chip(bus);
|
||||
|
||||
if (bus->irq >= 0)
|
||||
free_irq(bus->irq, (void *)bus);
|
||||
|
@ -1096,7 +1096,7 @@ static void skl_shutdown(struct pci_dev *pci)
|
|||
if (!skl->init_done)
|
||||
return;
|
||||
|
||||
snd_hdac_ext_stop_streams(bus);
|
||||
snd_hdac_stop_streams_and_chip(bus);
|
||||
list_for_each_entry(s, &bus->stream_list, list) {
|
||||
stream = stream_to_hdac_ext_stream(s);
|
||||
snd_hdac_ext_stream_decouple(bus, stream, false);
|
||||
|
|
Loading…
Reference in a new issue