]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: hda - Use snd_hda_codec_get_pincfg() in the rest places
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2009 08:28:12 +0000 (09:28 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2009 08:28:12 +0000 (09:28 +0100)
Replace with snd_hda_codec_get_pincfg() in the places where available.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_generic.c

index 6fa871f66a72bf5afdd13cbc8de10ad413abcd5e..8ec2dfca9a6c989e3b380ed251d25224d0f2233b 100644 (file)
@@ -3488,8 +3488,7 @@ int snd_hda_parse_pin_def_config(struct hda_codec *codec,
                if (ignore_nids && is_in_nid_list(nid, ignore_nids))
                        continue;
 
-               def_conf = snd_hda_codec_read(codec, nid, 0,
-                                             AC_VERB_GET_CONFIG_DEFAULT, 0);
+               def_conf = snd_hda_codec_get_pincfg(codec, nid);
                if (get_defcfg_connect(def_conf) == AC_JACK_PORT_NONE)
                        continue;
                loc = get_defcfg_location(def_conf);
index 65745e96dc701d91cb5bcbf31b883e80f53791e9..2c81a683e8f8367ec964313a5f1cb29015c23e62 100644 (file)
@@ -146,7 +146,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid
        if (node->type == AC_WID_PIN) {
                node->pin_caps = snd_hda_param_read(codec, node->nid, AC_PAR_PIN_CAP);
                node->pin_ctl = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
-               node->def_cfg = snd_hda_codec_read(codec, node->nid, 0, AC_VERB_GET_CONFIG_DEFAULT, 0);
+               node->def_cfg = snd_hda_codec_get_pincfg(codec, node->nid);
        }
 
        if (node->wid_caps & AC_WCAP_OUT_AMP) {