aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_hdmi.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-09-11 08:06:53 -0400
committerTakashi Iwai <tiwai@suse.de>2014-09-11 08:14:21 -0400
commit62f949bf6bf6ceb44872c44ef3913a96d93fb5d4 (patch)
tree6fb4df39d050165aa24243b80c4dc763d6b8e8c9 /sound/pci/hda/patch_hdmi.c
parent998052b74574699bdd1e451b6556e4d7667a7a4e (diff)
ALSA: hda - Get rid of action field from struct hda_jack_tbl
The action value assigned to each hda_jack_tbl entry is mostly superfluous. The actually used values are either the widget NID or a value specific to the callback. The former case can be simply replaced by a reference to widget NID itself. The only place doing the latter is STAC/IDT codec driver for the powermap handling. But, the code doesn't need to check the action field at all -- the function jack_update_power() is called either with a specific pin or with NULL. So the check of jack->action can be removed completely there, too. 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 99d7d7fecaad..8f94527f1890 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2165,7 +2165,7 @@ static int generic_hdmi_init(struct hda_codec *codec)
2165 hda_nid_t pin_nid = per_pin->pin_nid; 2165 hda_nid_t pin_nid = per_pin->pin_nid;
2166 2166
2167 hdmi_init_pin(codec, pin_nid); 2167 hdmi_init_pin(codec, pin_nid);
2168 snd_hda_jack_detect_enable_callback(codec, pin_nid, pin_nid, 2168 snd_hda_jack_detect_enable_callback(codec, pin_nid,
2169 codec->jackpoll_interval > 0 ? jack_callback : NULL); 2169 codec->jackpoll_interval > 0 ? jack_callback : NULL);
2170 } 2170 }
2171 return 0; 2171 return 0;
@@ -2428,7 +2428,7 @@ static int simple_playback_init(struct hda_codec *codec)
2428 if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) 2428 if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP)
2429 snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE, 2429 snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE,
2430 AMP_OUT_UNMUTE); 2430 AMP_OUT_UNMUTE);
2431 snd_hda_jack_detect_enable(codec, pin, pin); 2431 snd_hda_jack_detect_enable(codec, pin);
2432 return 0; 2432 return 0;
2433} 2433}
2434 2434