Skip to content

L
linux
Commit 1a4f69d5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: hda - Allow multiple callbacks for jack 

So far, hda_jack infrastructure allows only one callback per jack, and
this makes things slightly complicated when a driver wants to assign
multiple tasks to a jack, e.g. the standard auto-mute with a power
up/down sequence.  This can be simplified if the hda_jack accepts
multiple callbacks.

This patch is such an extension: the callback-specific part (the
function and private_data) is split to another struct from
hda_jack_tbl, and multiple such objects can be assigned to a single
hda_jack_tbl entry.

The new struct hda_jack_callback is passed to each callback function
now, thus the patch became bigger than expected.  But these changes
are mostly trivial.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bda17b82
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 65 deletions
sound/pci/hda/hda_generic.c
View file @ 1a4f69d5
...@@ -2032,7 +2032,8 @@ static int create_speaker_out_ctls(struct hda_codec *codec) ...@@ -2032,7 +2032,8 @@ static int create_speaker_out_ctls(struct hda_codec *codec)
* independent HP controls * independent HP controls
*/ */
static void call_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack); static void call_hp_automute(struct hda_codec *codec,
struct hda_jack_callback *jack);
static int indep_hp_info(struct snd_kcontrol *kcontrol, static int indep_hp_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo) struct snd_ctl_elem_info *uinfo)
{ {
...@@ -3948,7 +3949,8 @@ static void call_update_outputs(struct hda_codec *codec) ...@@ -3948,7 +3949,8 @@ static void call_update_outputs(struct hda_codec *codec)
} }
/* standard HP-automute helper */ /* standard HP-automute helper */
void snd_hda_gen_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) void snd_hda_gen_hp_automute(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
hda_nid_t *pins = spec->autocfg.hp_pins; hda_nid_t *pins = spec->autocfg.hp_pins;
...@@ -3968,7 +3970,8 @@ void snd_hda_gen_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) ...@@ -3968,7 +3970,8 @@ void snd_hda_gen_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack)
EXPORT_SYMBOL_GPL(snd_hda_gen_hp_automute); EXPORT_SYMBOL_GPL(snd_hda_gen_hp_automute);
/* standard line-out-automute helper */ /* standard line-out-automute helper */
void snd_hda_gen_line_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) void snd_hda_gen_line_automute(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
...@@ -3988,7 +3991,8 @@ void snd_hda_gen_line_automute(struct hda_codec *codec, struct hda_jack_tbl *jac ...@@ -3988,7 +3991,8 @@ void snd_hda_gen_line_automute(struct hda_codec *codec, struct hda_jack_tbl *jac
EXPORT_SYMBOL_GPL(snd_hda_gen_line_automute); EXPORT_SYMBOL_GPL(snd_hda_gen_line_automute);
/* standard mic auto-switch helper */ /* standard mic auto-switch helper */
void snd_hda_gen_mic_autoswitch(struct hda_codec *codec, struct hda_jack_tbl *jack) void snd_hda_gen_mic_autoswitch(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
int i; int i;
...@@ -4011,7 +4015,8 @@ void snd_hda_gen_mic_autoswitch(struct hda_codec *codec, struct hda_jack_tbl *ja ...@@ -4011,7 +4015,8 @@ void snd_hda_gen_mic_autoswitch(struct hda_codec *codec, struct hda_jack_tbl *ja
EXPORT_SYMBOL_GPL(snd_hda_gen_mic_autoswitch); EXPORT_SYMBOL_GPL(snd_hda_gen_mic_autoswitch);
/* call appropriate hooks */ /* call appropriate hooks */
static void call_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) static void call_hp_automute(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
if (spec->hp_automute_hook) if (spec->hp_automute_hook)
...@@ -4021,7 +4026,7 @@ static void call_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) ...@@ -4021,7 +4026,7 @@ static void call_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack)
} }
static void call_line_automute(struct hda_codec *codec, static void call_line_automute(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
if (spec->line_automute_hook) if (spec->line_automute_hook)
...@@ -4031,7 +4036,7 @@ static void call_line_automute(struct hda_codec *codec, ...@@ -4031,7 +4036,7 @@ static void call_line_automute(struct hda_codec *codec,
} }
static void call_mic_autoswitch(struct hda_codec *codec, static void call_mic_autoswitch(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
struct hda_gen_spec *spec = codec->spec; struct hda_gen_spec *spec = codec->spec;
if (spec->mic_autoswitch_hook) if (spec->mic_autoswitch_hook)
......
sound/pci/hda/hda_generic.h
View file @ 1a4f69d5
...@@ -284,11 +284,11 @@ struct hda_gen_spec { ...@@ -284,11 +284,11 @@ struct hda_gen_spec {
/* automute / autoswitch hooks */ /* automute / autoswitch hooks */
void (*hp_automute_hook)(struct hda_codec *codec, void (*hp_automute_hook)(struct hda_codec *codec,
struct hda_jack_tbl *tbl); struct hda_jack_callback *cb);
void (*line_automute_hook)(struct hda_codec *codec, void (*line_automute_hook)(struct hda_codec *codec,
struct hda_jack_tbl *tbl); struct hda_jack_callback *cb);
void (*mic_autoswitch_hook)(struct hda_codec *codec, void (*mic_autoswitch_hook)(struct hda_codec *codec,
struct hda_jack_tbl *tbl); struct hda_jack_callback *cb);
}; };
int snd_hda_gen_spec_init(struct hda_gen_spec *spec); int snd_hda_gen_spec_init(struct hda_gen_spec *spec);
...@@ -320,11 +320,11 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec); ...@@ -320,11 +320,11 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec);
/* standard jack event callbacks */ /* standard jack event callbacks */
void snd_hda_gen_hp_automute(struct hda_codec *codec, void snd_hda_gen_hp_automute(struct hda_codec *codec,
struct hda_jack_tbl *jack); struct hda_jack_callback *jack);
void snd_hda_gen_line_automute(struct hda_codec *codec, void snd_hda_gen_line_automute(struct hda_codec *codec,
struct hda_jack_tbl *jack); struct hda_jack_callback *jack);
void snd_hda_gen_mic_autoswitch(struct hda_codec *codec, void snd_hda_gen_mic_autoswitch(struct hda_codec *codec,
struct hda_jack_tbl *jack); struct hda_jack_callback *jack);
void snd_hda_gen_update_outputs(struct hda_codec *codec); void snd_hda_gen_update_outputs(struct hda_codec *codec);
#ifdef CONFIG_PM #ifdef CONFIG_PM
......
sound/pci/hda/hda_jack.c
View file @ 1a4f69d5
...@@ -111,17 +111,21 @@ snd_hda_jack_tbl_new(struct hda_codec *codec, hda_nid_t nid) ...@@ -111,17 +111,21 @@ snd_hda_jack_tbl_new(struct hda_codec *codec, hda_nid_t nid)
void snd_hda_jack_tbl_clear(struct hda_codec *codec) void snd_hda_jack_tbl_clear(struct hda_codec *codec)
{ {
struct hda_jack_tbl *jack = codec->jacktbl.list;
int i;
for (i = 0; i < codec->jacktbl.used; i++, jack++) {
struct hda_jack_callback *cb, *next;
#ifdef CONFIG_SND_HDA_INPUT_JACK #ifdef CONFIG_SND_HDA_INPUT_JACK
/* free jack instances manually when clearing/reconfiguring */ /* free jack instances manually when clearing/reconfiguring */
if (!codec->bus->shutdown && codec->jacktbl.list) { if (!codec->bus->shutdown && jack->jack)
struct hda_jack_tbl *jack = codec->jacktbl.list; snd_device_free(codec->bus->card, jack->jack);
int i; #endif
for (i = 0; i < codec->jacktbl.used; i++, jack++) { for (cb = jack->callback; cb; cb = next) {
if (jack->jack) next = cb->next;
snd_device_free(codec->bus->card, jack->jack); kfree(cb);
} }
} }
#endif
snd_array_free(&codec->jacktbl); snd_array_free(&codec->jacktbl);
} }
...@@ -219,28 +223,38 @@ EXPORT_SYMBOL_GPL(snd_hda_jack_detect_state); ...@@ -219,28 +223,38 @@ EXPORT_SYMBOL_GPL(snd_hda_jack_detect_state);
* errno. Check and handle the return value appropriately with standard * errno. Check and handle the return value appropriately with standard
* macros such as @IS_ERR() and @PTR_ERR(). * macros such as @IS_ERR() and @PTR_ERR().
*/ */
struct hda_jack_tbl * struct hda_jack_callback *
snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid,
hda_jack_callback cb) hda_jack_callback_fn func)
{ {
struct hda_jack_tbl *jack = snd_hda_jack_tbl_new(codec, nid); struct hda_jack_tbl *jack;
struct hda_jack_callback *callback = NULL;
int err; int err;
jack = snd_hda_jack_tbl_new(codec, nid);
if (!jack) if (!jack)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (func) {
callback = kzalloc(sizeof(*callback), GFP_KERNEL);
if (!callback)
return ERR_PTR(-ENOMEM);
callback->func = func;
callback->tbl = jack;
callback->next = jack->callback;
jack->callback = callback;
}
if (jack->jack_detect) if (jack->jack_detect)
return jack; /* already registered */ return callback; /* already registered */
jack->jack_detect = 1; jack->jack_detect = 1;
if (cb)
jack->callback = cb;
if (codec->jackpoll_interval > 0) if (codec->jackpoll_interval > 0)
return jack; /* No unsol if we're polling instead */ return callback; /* No unsol if we're polling instead */
err = snd_hda_codec_write_cache(codec, nid, 0, err = snd_hda_codec_write_cache(codec, nid, 0,
AC_VERB_SET_UNSOLICITED_ENABLE, AC_VERB_SET_UNSOLICITED_ENABLE,
AC_USRSP_EN | jack->tag); AC_USRSP_EN | jack->tag);
if (err < 0) if (err < 0)
return ERR_PTR(err); return ERR_PTR(err);
return jack; return callback;
} }
EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable_callback); EXPORT_SYMBOL_GPL(snd_hda_jack_detect_enable_callback);
...@@ -503,13 +517,17 @@ EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctls); ...@@ -503,13 +517,17 @@ EXPORT_SYMBOL_GPL(snd_hda_jack_add_kctls);
static void call_jack_callback(struct hda_codec *codec, static void call_jack_callback(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_tbl *jack)
{ {
if (jack->callback) struct hda_jack_callback *cb;
jack->callback(codec, jack);
for (cb = jack->callback; cb; cb = cb->next)
cb->func(codec, cb);
if (jack->gated_jack) { if (jack->gated_jack) {
struct hda_jack_tbl *gated = struct hda_jack_tbl *gated =
snd_hda_jack_tbl_get(codec, jack->gated_jack); snd_hda_jack_tbl_get(codec, jack->gated_jack);
if (gated && gated->callback) if (gated) {
gated->callback(codec, gated); for (cb = gated->callback; cb; cb = cb->next)
cb->func(codec, cb);
}
} }
} }
......
sound/pci/hda/hda_jack.h
View file @ 1a4f69d5
...@@ -14,14 +14,21 @@ ...@@ -14,14 +14,21 @@
struct auto_pin_cfg; struct auto_pin_cfg;
struct hda_jack_tbl; struct hda_jack_tbl;
struct hda_jack_callback;
typedef void (*hda_jack_callback) (struct hda_codec *, struct hda_jack_tbl *); typedef void (*hda_jack_callback_fn) (struct hda_codec *, struct hda_jack_callback *);
struct hda_jack_callback {
struct hda_jack_tbl *tbl;
hda_jack_callback_fn func;
unsigned int private_data; /* arbitrary data */
struct hda_jack_callback *next;
};
struct hda_jack_tbl { struct hda_jack_tbl {
hda_nid_t nid; hda_nid_t nid;
unsigned char tag; /* unsol event tag */ unsigned char tag; /* unsol event tag */
unsigned int private_data; /* arbitrary data */ struct hda_jack_callback *callback;
hda_jack_callback callback;
/* jack-detection stuff */ /* jack-detection stuff */
unsigned int pin_sense; /* cached pin-sense value */ unsigned int pin_sense; /* cached pin-sense value */
unsigned int jack_detect:1; /* capable of jack-detection? */ unsigned int jack_detect:1; /* capable of jack-detection? */
...@@ -47,9 +54,9 @@ void snd_hda_jack_tbl_clear(struct hda_codec *codec); ...@@ -47,9 +54,9 @@ void snd_hda_jack_tbl_clear(struct hda_codec *codec);
void snd_hda_jack_set_dirty_all(struct hda_codec *codec); void snd_hda_jack_set_dirty_all(struct hda_codec *codec);
int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid); int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid);
struct hda_jack_tbl * struct hda_jack_callback *
snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid,
hda_jack_callback cb); hda_jack_callback_fn cb);
int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid, int snd_hda_jack_set_gating_jack(struct hda_codec *codec, hda_nid_t gated_nid,
hda_nid_t gating_nid); hda_nid_t gating_nid);
......
sound/pci/hda/patch_cirrus.c
View file @ 1a4f69d5
...@@ -982,7 +982,7 @@ static void cs4210_pinmux_init(struct hda_codec *codec) ...@@ -982,7 +982,7 @@ static void cs4210_pinmux_init(struct hda_codec *codec)
} }
static void cs4210_spdif_automute(struct hda_codec *codec, static void cs4210_spdif_automute(struct hda_codec *codec,
struct hda_jack_tbl *tbl) struct hda_jack_callback *tbl)
{ {
struct cs_spec *spec = codec->spec; struct cs_spec *spec = codec->spec;
bool spdif_present = false; bool spdif_present = false;
......
sound/pci/hda/patch_conexant.c
View file @ 1a4f69d5
...@@ -393,7 +393,8 @@ static void olpc_xo_update_mic_pins(struct hda_codec *codec) ...@@ -393,7 +393,8 @@ static void olpc_xo_update_mic_pins(struct hda_codec *codec)
} }
/* mic_autoswitch hook */ /* mic_autoswitch hook */
static void olpc_xo_automic(struct hda_codec *codec, struct hda_jack_tbl *jack) static void olpc_xo_automic(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
int saved_cached_write = codec->cached_write; int saved_cached_write = codec->cached_write;
......
sound/pci/hda/patch_hdmi.c
View file @ 1a4f69d5
...@@ -1163,17 +1163,23 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, ...@@ -1163,17 +1163,23 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll); static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll);
static void jack_callback(struct hda_codec *codec, struct hda_jack_tbl *jack) static void check_presence_and_report(struct hda_codec *codec, hda_nid_t nid)
{ {
struct hdmi_spec *spec = codec->spec; struct hdmi_spec *spec = codec->spec;
int pin_idx = pin_nid_to_pin_index(codec, jack->nid); int pin_idx = pin_nid_to_pin_index(codec, nid);
if (pin_idx < 0) if (pin_idx < 0)
return; return;
if (hdmi_present_sense(get_pin(spec, pin_idx), 1)) if (hdmi_present_sense(get_pin(spec, pin_idx), 1))
snd_hda_jack_report_sync(codec); snd_hda_jack_report_sync(codec);
} }
static void jack_callback(struct hda_codec *codec,
struct hda_jack_callback *jack)
{
check_presence_and_report(codec, jack->tbl->nid);
}
static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
{ {
int tag = res >> AC_UNSOL_RES_TAG_SHIFT; int tag = res >> AC_UNSOL_RES_TAG_SHIFT;
...@@ -1190,7 +1196,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) ...@@ -1190,7 +1196,7 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)
codec->addr, jack->nid, dev_entry, !!(res & AC_UNSOL_RES_IA), codec->addr, jack->nid, dev_entry, !!(res & AC_UNSOL_RES_IA),
!!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV)); !!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV));
jack_callback(codec, jack); check_presence_and_report(codec, jack->nid);
} }
static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res) static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
......
sound/pci/hda/patch_realtek.c
View file @ 1a4f69d5
...@@ -264,7 +264,8 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid, ...@@ -264,7 +264,8 @@ static void alc_fix_pll_init(struct hda_codec *codec, hda_nid_t nid,
} }
/* update the master volume per volume-knob's unsol event */ /* update the master volume per volume-knob's unsol event */
static void alc_update_knob_master(struct hda_codec *codec, struct hda_jack_tbl *jack) static void alc_update_knob_master(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
unsigned int val; unsigned int val;
struct snd_kcontrol *kctl; struct snd_kcontrol *kctl;
...@@ -276,7 +277,7 @@ static void alc_update_knob_master(struct hda_codec *codec, struct hda_jack_tbl ...@@ -276,7 +277,7 @@ static void alc_update_knob_master(struct hda_codec *codec, struct hda_jack_tbl
uctl = kzalloc(sizeof(*uctl), GFP_KERNEL); uctl = kzalloc(sizeof(*uctl), GFP_KERNEL);
if (!uctl) if (!uctl)
return; return;
val = snd_hda_codec_read(codec, jack->nid, 0, val = snd_hda_codec_read(codec, jack->tbl->nid, 0,
AC_VERB_GET_VOLUME_KNOB_CONTROL, 0); AC_VERB_GET_VOLUME_KNOB_CONTROL, 0);
val &= HDA_AMP_VOLMASK; val &= HDA_AMP_VOLMASK;
uctl->value.integer.value[0] = val; uctl->value.integer.value[0] = val;
...@@ -3272,7 +3273,7 @@ static void alc269_fixup_quanta_mute(struct hda_codec *codec, ...@@ -3272,7 +3273,7 @@ static void alc269_fixup_quanta_mute(struct hda_codec *codec,
} }
static void alc269_x101_hp_automute_hook(struct hda_codec *codec, static void alc269_x101_hp_automute_hook(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int vref; int vref;
...@@ -3926,7 +3927,8 @@ static void alc_update_headset_mode_hook(struct hda_codec *codec, ...@@ -3926,7 +3927,8 @@ static void alc_update_headset_mode_hook(struct hda_codec *codec,
alc_update_headset_mode(codec); alc_update_headset_mode(codec);
} }
static void alc_update_headset_jack_cb(struct hda_codec *codec, struct hda_jack_tbl *jack) static void alc_update_headset_jack_cb(struct hda_codec *codec,
struct hda_jack_callback *jack)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN; spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN;
...@@ -4166,7 +4168,7 @@ static void alc269_fixup_limit_int_mic_boost(struct hda_codec *codec, ...@@ -4166,7 +4168,7 @@ static void alc269_fixup_limit_int_mic_boost(struct hda_codec *codec,
} }
static void alc283_hp_automute_hook(struct hda_codec *codec, static void alc283_hp_automute_hook(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
int vref; int vref;
......
sound/pci/hda/patch_sigmatel.c
View file @ 1a4f69d5
...@@ -481,7 +481,7 @@ static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid, ...@@ -481,7 +481,7 @@ static void stac_toggle_power_map(struct hda_codec *codec, hda_nid_t nid,
/* update power bit per jack plug/unplug */ /* update power bit per jack plug/unplug */
static void jack_update_power(struct hda_codec *codec, static void jack_update_power(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
int i; int i;
...@@ -489,9 +489,9 @@ static void jack_update_power(struct hda_codec *codec, ...@@ -489,9 +489,9 @@ static void jack_update_power(struct hda_codec *codec,
if (!spec->num_pwrs) if (!spec->num_pwrs)
return; return;
if (jack && jack->nid) { if (jack && jack->tbl->nid) {
stac_toggle_power_map(codec, jack->nid, stac_toggle_power_map(codec, jack->tbl->nid,
snd_hda_jack_detect(codec, jack->nid), snd_hda_jack_detect(codec, jack->tbl->nid),
true); true);
return; return;
} }
...@@ -499,8 +499,7 @@ static void jack_update_power(struct hda_codec *codec, ...@@ -499,8 +499,7 @@ static void jack_update_power(struct hda_codec *codec,
/* update all jacks */ /* update all jacks */
for (i = 0; i < spec->num_pwrs; i++) { for (i = 0; i < spec->num_pwrs; i++) {
hda_nid_t nid = spec->pwr_nids[i]; hda_nid_t nid = spec->pwr_nids[i];
jack = snd_hda_jack_tbl_get(codec, nid); if (!snd_hda_jack_tbl_get(codec, nid))
if (!jack)
continue; continue;
stac_toggle_power_map(codec, nid, stac_toggle_power_map(codec, nid,
snd_hda_jack_detect(codec, nid), snd_hda_jack_detect(codec, nid),
...@@ -512,27 +511,28 @@ static void jack_update_power(struct hda_codec *codec, ...@@ -512,27 +511,28 @@ static void jack_update_power(struct hda_codec *codec,
} }
static void stac_hp_automute(struct hda_codec *codec, static void stac_hp_automute(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
snd_hda_gen_hp_automute(codec, jack); snd_hda_gen_hp_automute(codec, jack);
jack_update_power(codec, jack); jack_update_power(codec, jack);
} }
static void stac_line_automute(struct hda_codec *codec, static void stac_line_automute(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
snd_hda_gen_line_automute(codec, jack); snd_hda_gen_line_automute(codec, jack);
jack_update_power(codec, jack); jack_update_power(codec, jack);
} }
static void stac_mic_autoswitch(struct hda_codec *codec, static void stac_mic_autoswitch(struct hda_codec *codec,
struct hda_jack_tbl *jack) struct hda_jack_callback *jack)
{ {
snd_hda_gen_mic_autoswitch(codec, jack); snd_hda_gen_mic_autoswitch(codec, jack);
jack_update_power(codec, jack); jack_update_power(codec, jack);
} }
static void stac_vref_event(struct hda_codec *codec, struct hda_jack_tbl *event) static void stac_vref_event(struct hda_codec *codec,
struct hda_jack_callback *event)
{ {
unsigned int data; unsigned int data;
...@@ -3011,7 +3011,7 @@ static void stac92hd71bxx_fixup_hp_m4(struct hda_codec *codec, ...@@ -3011,7 +3011,7 @@ static void stac92hd71bxx_fixup_hp_m4(struct hda_codec *codec,
const struct hda_fixup *fix, int action) const struct hda_fixup *fix, int action)
{ {
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
struct hda_jack_tbl *jack; struct hda_jack_callback *jack;
if (action != HDA_FIXUP_ACT_PRE_PROBE) if (action != HDA_FIXUP_ACT_PRE_PROBE)
return; return;
...@@ -4033,7 +4033,7 @@ static void stac9205_fixup_dell_m43(struct hda_codec *codec, ...@@ -4033,7 +4033,7 @@ static void stac9205_fixup_dell_m43(struct hda_codec *codec,
const struct hda_fixup *fix, int action) const struct hda_fixup *fix, int action)
{ {
struct sigmatel_spec *spec = codec->spec; struct sigmatel_spec *spec = codec->spec;
struct hda_jack_tbl *jack; struct hda_jack_callback *jack;
if (action == HDA_FIXUP_ACT_PRE_PROBE) { if (action == HDA_FIXUP_ACT_PRE_PROBE) {
snd_hda_apply_pincfgs(codec, dell_9205_m43_pin_configs); snd_hda_apply_pincfgs(codec, dell_9205_m43_pin_configs);
......
sound/pci/hda/patch_via.c
View file @ 1a4f69d5
...@@ -118,7 +118,7 @@ static void via_playback_pcm_hook(struct hda_pcm_stream *hinfo, ...@@ -118,7 +118,7 @@ static void via_playback_pcm_hook(struct hda_pcm_stream *hinfo,
struct hda_codec *codec, struct hda_codec *codec,
struct snd_pcm_substream *substream, struct snd_pcm_substream *substream,
int action); int action);
static void via_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *tbl); static void via_hp_automute(struct hda_codec *codec, struct hda_jack_callback *tbl);
static struct via_spec *via_new_spec(struct hda_codec *codec) static struct via_spec *via_new_spec(struct hda_codec *codec)
{ {
...@@ -575,19 +575,22 @@ static const struct snd_kcontrol_new vt1708_jack_detect_ctl[] = { ...@@ -575,19 +575,22 @@ static const struct snd_kcontrol_new vt1708_jack_detect_ctl[] = {
{} /* terminator */ {} /* terminator */
}; };
static void via_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *tbl) static void via_hp_automute(struct hda_codec *codec,
struct hda_jack_callback *tbl)
{ {
set_widgets_power_state(codec); set_widgets_power_state(codec);
snd_hda_gen_hp_automute(codec, tbl); snd_hda_gen_hp_automute(codec, tbl);
} }
static void via_line_automute(struct hda_codec *codec, struct hda_jack_tbl *tbl) static void via_line_automute(struct hda_codec *codec,
struct hda_jack_callback *tbl)
{ {
set_widgets_power_state(codec); set_widgets_power_state(codec);
snd_hda_gen_line_automute(codec, tbl); snd_hda_gen_line_automute(codec, tbl);
} }
static void via_jack_powerstate_event(struct hda_codec *codec, struct hda_jack_tbl *tbl) static void via_jack_powerstate_event(struct hda_codec *codec,
struct hda_jack_callback *tbl)
{ {
set_widgets_power_state(codec); set_widgets_power_state(codec);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7