diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-21 08:27:37 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-21 09:06:05 -0500 |
commit | efc2f8de1da8e140331cfdbfdc6e0d596c33fb40 (patch) | |
tree | 22037b4e31412c8c5a68a87d9b30ea512869d9b3 /sound/pci/hda/patch_hdmi.c | |
parent | b0db6063dba4ee02dfda7411ec3aaf8f0fbda0f7 (diff) |
ALSA: hda - Use standard helper functions in patch_hdmi.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
-rw-r--r-- | sound/pci/hda/patch_hdmi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 3824699142ee..0fcfa6f406b8 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c | |||
@@ -1193,12 +1193,11 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid) | |||
1193 | struct hdmi_spec_per_pin *per_pin; | 1193 | struct hdmi_spec_per_pin *per_pin; |
1194 | int err; | 1194 | int err; |
1195 | 1195 | ||
1196 | caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP); | 1196 | caps = snd_hda_query_pin_caps(codec, pin_nid); |
1197 | if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP))) | 1197 | if (!(caps & (AC_PINCAP_HDMI | AC_PINCAP_DP))) |
1198 | return 0; | 1198 | return 0; |
1199 | 1199 | ||
1200 | config = snd_hda_codec_read(codec, pin_nid, 0, | 1200 | config = snd_hda_codec_get_pincfg(codec, pin_nid); |
1201 | AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
1202 | if (get_defcfg_connect(config) == AC_JACK_PORT_NONE) | 1201 | if (get_defcfg_connect(config) == AC_JACK_PORT_NONE) |
1203 | return 0; | 1202 | return 0; |
1204 | 1203 | ||
@@ -1272,7 +1271,7 @@ static int hdmi_parse_codec(struct hda_codec *codec) | |||
1272 | unsigned int caps; | 1271 | unsigned int caps; |
1273 | unsigned int type; | 1272 | unsigned int type; |
1274 | 1273 | ||
1275 | caps = snd_hda_param_read(codec, nid, AC_PAR_AUDIO_WIDGET_CAP); | 1274 | caps = get_wcaps(codec, nid); |
1276 | type = get_wcaps_type(caps); | 1275 | type = get_wcaps_type(caps); |
1277 | 1276 | ||
1278 | if (!(caps & AC_WCAP_DIGITAL)) | 1277 | if (!(caps & AC_WCAP_DIGITAL)) |