xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: x86: Minor cleanup of reset buffer procedure

Browse Source 
The procedure to reset buffer pointers is performed in two places and
still open-coded.  Simplify the helper function and use it
consistently.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2017-02-04 21:39:56 +01:00
parent 83af57dd51
commit f4566aa112
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sound/x86/intel_hdmi_audio.c
View File

@@ -252,10 +252,11 @@ static void snd_intelhad_enable_audio_int(struct snd_intelhad *ctx, bool enable)
} }
} }
static void snd_intelhad_reset_audio(struct snd_intelhad *intelhaddata, /* Reset buffer pointers */
u8 reset) static void had_reset_audio(struct snd_intelhad *intelhaddata)
{ {
had_write_register(intelhaddata, AUD_HDMI_STATUS, reset); had_write_register(intelhaddata, AUD_HDMI_STATUS, 1);
had_write_register(intelhaddata, AUD_HDMI_STATUS, 0);
} }
/* /*
@@ -893,8 +894,7 @@ static void snd_intelhad_handle_underrun(struct snd_intelhad *intelhaddata)
/* Handle Underrun interrupt within Audio Unit */ /* Handle Underrun interrupt within Audio Unit */
had_write_register(intelhaddata, AUD_CONFIG, 0); had_write_register(intelhaddata, AUD_CONFIG, 0);
/* Reset buffer pointers */ /* Reset buffer pointers */
had_write_register(intelhaddata, AUD_HDMI_STATUS, 1); had_reset_audio(intelhaddata);
had_write_register(intelhaddata, AUD_HDMI_STATUS, 0);
/* /*
* The interrupt status 'sticky' bits might not be cleared by * The interrupt status 'sticky' bits might not be cleared by
* setting '1' to that bit once... * setting '1' to that bit once...
@@ -1085,8 +1085,7 @@ static int snd_intelhad_pcm_trigger(struct snd_pcm_substream *substream,
snd_intelhad_enable_audio_int(intelhaddata, false); snd_intelhad_enable_audio_int(intelhaddata, false);
snd_intelhad_enable_audio(substream, intelhaddata, false); snd_intelhad_enable_audio(substream, intelhaddata, false);
/* Reset buffer pointers */ /* Reset buffer pointers */
snd_intelhad_reset_audio(intelhaddata, 1); had_reset_audio(intelhaddata);
snd_intelhad_reset_audio(intelhaddata, 0);
snd_intelhad_enable_audio_int(intelhaddata, false); snd_intelhad_enable_audio_int(intelhaddata, false);
break; break;