Skip to content

L
linux
Commit efc2f8de authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Use standard helper functions in patch_hdmi.c 

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b0db6063
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
sound/pci/hda/patch_hdmi.c
View file @ efc2f8de
...@@ -1193,12 +1193,11 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) ...@@ -1193,12 +1193,11 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
struct hdmi_spec_per_pin *per_pin; struct hdmi_spec_per_pin *per_pin;
int err; int err;
caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP); caps = snd_hda_query_pin_caps(codec, pin_nid);
if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP))) if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP)))
return 0; return 0;
config = snd_hda_codec_read(codec, pin_nid, 0, config = snd_hda_codec_get_pincfg(codec, pin_nid);
AC_VERB_GET_CONFIG_DEFAULT, 0);
if (get_defcfg_connect(config) == AC_JACK_PORT_NONE) if (get_defcfg_connect(config) == AC_JACK_PORT_NONE)
return 0; return 0;
...@@ -1272,7 +1271,7 @@ static int hdmi_parse_codec(struct hda_codec *codec) ...@@ -1272,7 +1271,7 @@ static int hdmi_parse_codec(struct hda_codec *codec)
unsigned int caps; unsigned int caps;
unsigned int type; unsigned int type;
caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP); caps = get_wcaps(codec, nid);
type = get_wcaps_type(caps); type = get_wcaps_type(caps);
if (!(caps & AC_WCAP_DIGITAL)) if (!(caps & AC_WCAP_DIGITAL))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7