diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-04-20 04:51:11 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-04-20 04:51:38 -0400 |
commit | 7670dc41b51983b369f9adfb8694a580e7b0cef2 (patch) | |
tree | 3e14d29d878ba853b79bf9add93132b13affc4ad /sound | |
parent | 67667263674663767ddf4250bab2437a00ee780e (diff) |
ALSA: hda - Use snd_hda_codec_get_pincfg() in patch_ca0110.c
Use the new function to reduce the access and allow the user setup
via sysfs, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_ca0110.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index 9398d92f18bd..392d108c3558 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c | |||
@@ -408,8 +408,7 @@ static void parse_line_outs(struct hda_codec *codec) | |||
408 | n = 0; | 408 | n = 0; |
409 | for (i = 0; i < cfg->line_outs; i++) { | 409 | for (i = 0; i < cfg->line_outs; i++) { |
410 | nid = cfg->line_out_pins[i]; | 410 | nid = cfg->line_out_pins[i]; |
411 | def_conf = snd_hda_codec_read(codec, nid, 0, | 411 | def_conf = snd_hda_codec_get_pincfg(codec, nid); |
412 | AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
413 | if (!def_conf) | 412 | if (!def_conf) |
414 | continue; /* invalid pin */ | 413 | continue; /* invalid pin */ |
415 | if (snd_hda_get_connections(codec, nid, &spec->dacs[i], 1) != 1) | 414 | if (snd_hda_get_connections(codec, nid, &spec->dacs[i], 1) != 1) |
@@ -432,8 +431,7 @@ static void parse_hp_out(struct hda_codec *codec) | |||
432 | if (!cfg->hp_outs) | 431 | if (!cfg->hp_outs) |
433 | return; | 432 | return; |
434 | nid = cfg->hp_pins[0]; | 433 | nid = cfg->hp_pins[0]; |
435 | def_conf = snd_hda_codec_read(codec, nid, 0, | 434 | def_conf = snd_hda_codec_get_pincfg(codec, nid); |
436 | AC_VERB_GET_CONFIG_DEFAULT, 0); | ||
437 | if (!def_conf) { | 435 | if (!def_conf) { |
438 | cfg->hp_outs = 0; | 436 | cfg->hp_outs = 0; |
439 | return; | 437 | return; |