diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-18 14:10:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-18 14:34:22 +0100 |
| commit | a90229e0517938a5c5d9d682708b6ee7cd0e19b9 (patch) | |
| tree | 1fb5352f62bbc699feb24fa9c38a47d5f00de5eb /sound/pci/hda/hda_generic.h | |
| parent | a35bd1e3e6eadba210faedf93354c7657dd59238 (diff) | |
| download | linux-a90229e0517938a5c5d9d682708b6ee7cd0e19b9.tar.bz2 | |
ALSA: hda - Consolidate cap_sync_hook and capture_switch_hook
Two hooks in hda_gen_spec, cap_sync_hook and capture_switch_hook, play
very similar roles. The only differences are that the former is
called more often (e.g. at init or switching capsrc) while the latter
can take an on/off argument.
As a more generic implementation, consolidate these two hooks, and
pass snd_ctl_elem_value pointer as the second argument. If the
secondary argument is non-NULL, it can take the on/off value, so the
caller handles it like the former capture_switch_hook. If it's NULL,
it's called in the init or capsrc switch case.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index f6b88cd4584f..594a9cc4ecca 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -233,7 +233,8 @@ struct hda_gen_spec { /* hooks */ void (*init_hook)(struct hda_codec *codec); void (*automute_hook)(struct hda_codec *codec); - void (*cap_sync_hook)(struct hda_codec *codec); + void (*cap_sync_hook)(struct hda_codec *codec, + struct snd_ctl_elem_value *ucontrol); /* PCM hooks */ void (*pcm_playback_hook)(struct hda_pcm_stream *hinfo, @@ -252,9 +253,6 @@ struct hda_gen_spec { struct hda_jack_tbl *tbl); void (*mic_autoswitch_hook)(struct hda_codec *codec, struct hda_jack_tbl *tbl); - - /* capture switch hook (for mic-mute LED) */ - void (*capture_switch_hook)(struct hda_codec *codec, bool enable); }; int snd_hda_gen_spec_init(struct hda_gen_spec *spec); |