Commit c17a1aba authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent f1085c4f

sound/pci/hda/hda_codec.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

sound/pci/hda/hda_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {