aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-23 03:28:12 -0500
committerTakashi Iwai <tiwai@suse.de>2009-02-23 03:28:12 -0500
commitc17a1abae2f29047a0f57324240b01609489261b (patch)
tree86537857c7dcd188a702bfffe78b5298c738f308
parentf1085c4f319f1e43c95718045a235f276cc4b615 (diff)
ALSA: hda - Use snd_hda_codec_get_pincfg() in the rest places
Replace with snd_hda_codec_get_pincfg() in the places where available. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_codec.c3
-rw-r--r--sound/pci/hda/hda_generic.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 6fa871f66a7..8ec2dfca9a6 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3488,8 +3488,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
3488 if (ignore_nids && is_in_nid_list(nid, ignore_nids)) 3488 if (ignore_nids && is_in_nid_list(nid, ignore_nids))
3489 continue; 3489 continue;
3490 3490
3491 def_conf = snd_hda_codec_read(codec, nid, 0, 3491 def_conf = snd_hda_codec_get_pincfg(codec, nid);
3492 AC_VERB_GET_CONFIG_DEFAULT, 0);
3493 if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE) 3492 if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
3494 continue; 3493 continue;
3495 loc = get_defcfg_location(def_conf); 3494 loc = get_defcfg_location(def_conf);
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 65745e96dc7..2c81a683e8f 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -146,7 +146,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid
146 if (node->type == AC_WID_PIN) { 146 if (node->type == AC_WID_PIN) {
147 node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP); 147 node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP);
148 node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); 148 node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
149 node->def_cfg = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0); 149 node->def_cfg = snd_hda_codec_get_pincfg(codec, node->nid);
150 } 150 }
151 151
152 if (node->wid_caps & AC_WCAP_OUT_AMP) { 152 if (node->wid_caps & AC_WCAP_OUT_AMP) {