Commit d9185705 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Takashi Iwai
Browse files

ALSA: hda: Rework snd_hdac_stream_reset() to use macros 



We can use existing macros to poll and update register values instead of
open coding the functionality.

Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20220818141517.109280-3-amadeuszx.slawinski@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3cab69d9

sound/hda/hdac_stream.c

+6 −20
Original line number Diff line number Diff line
@@ -165,7 +165,6 @@ EXPORT_SYMBOL_GPL(snd_hdac_stop_streams_and_chip); 
void snd_hdac_stream_reset(struct hdac_stream *azx_dev)

{

	unsigned char val;

	int timeout;

	int dma_run_state;



	snd_hdac_stream_clear(azx_dev);
@@ -173,30 +172,17 @@ void snd_hdac_stream_reset(struct hdac_stream *azx_dev) 
	dma_run_state = snd_hdac_stream_readb(azx_dev, SD_CTL) & SD_CTL_DMA_START;



	snd_hdac_stream_updateb(azx_dev, SD_CTL, 0, SD_CTL_STREAM_RESET);

	udelay(3);

	timeout = 300;

	do {

		val = snd_hdac_stream_readb(azx_dev, SD_CTL) &

			SD_CTL_STREAM_RESET;

		if (val)

			break;

	} while (--timeout);



	/* wait for hardware to report that the stream entered reset */

	snd_hdac_stream_readb_poll(azx_dev, SD_CTL, val, (val & SD_CTL_STREAM_RESET), 3, 300);



	if (azx_dev->bus->dma_stop_delay && dma_run_state)

		udelay(azx_dev->bus->dma_stop_delay);



	val &= ~SD_CTL_STREAM_RESET;

	snd_hdac_stream_writeb(azx_dev, SD_CTL, val);

	udelay(3);

	snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_CTL_STREAM_RESET, 0);



	timeout = 300;

	/* waiting for hardware to report that the stream is out of reset */

	do {

		val = snd_hdac_stream_readb(azx_dev, SD_CTL) &

			SD_CTL_STREAM_RESET;

		if (!val)

			break;

	} while (--timeout);

	/* wait for hardware to report that the stream is out of reset */

	snd_hdac_stream_readb_poll(azx_dev, SD_CTL, val, !(val & SD_CTL_STREAM_RESET), 3, 300);



	/* reset first position - may not be synced with hw at this time */

	if (azx_dev->posbuf)