renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

ALSA: hda - Use snd_hda_check_power_state() in patch_hdmi.c

Browse Source 
... instead of open codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-06-18 16:28:36 +02:00
parent 7ef166b831
commit fd678cac34
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/hda/patch_hdmi.c
View File

@ -1026,14 +1026,10 @@ static void haswell_verify_pin_D0(struct hda_codec *codec,
/* For Haswell, the converter 1/2 may keep in D3 state after bootup, /* For Haswell, the converter 1/2 may keep in D3 state after bootup,
* thus pins could only choose converter 0 for use. Make sure the * thus pins could only choose converter 0 for use. Make sure the
* converters are in correct power state */ * converters are in correct power state */
pwr = snd_hda_codec_read(codec, cvt_nid, 0, AC_VERB_GET_POWER_STATE, 0); if (!snd_hda_check_power_state(codec, cvt_nid, AC_PWRST_D0))
pwr = (pwr & AC_PWRST_ACTUAL) >> AC_PWRST_ACTUAL_SHIFT;
if (pwr != AC_PWRST_D0)
snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D0); snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D0);
pwr = snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_POWER_STATE, 0); if (!snd_hda_check_power_state(codec, nid, AC_PWRST_D0)) {
pwr = (pwr & AC_PWRST_ACTUAL) >> AC_PWRST_ACTUAL_SHIFT;
if (pwr != AC_PWRST_D0) {
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE, snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_POWER_STATE,
AC_PWRST_D0); AC_PWRST_D0);
msleep(40); msleep(40);