diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-09-11 17:22:46 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-09-16 19:23:44 +0400 |
commit | 1a4f69d5aaecb39a980fc20b14ec800fd5b53061 (patch) | |
tree | f0fad4d91cbee4fa3436b53c16a5e436cc381550 /sound/pci/hda/patch_cirrus.c | |
parent | bda17b82bfa9601f167ec338755b0b96909db5a0 (diff) | |
download | linux-1a4f69d5aaecb39a980fc20b14ec800fd5b53061.tar.xz |
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 69b0ffc55a51..1589c9bcce3e 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -982,7 +982,7 @@ static void cs4210_pinmux_init(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; bool spdif_present = false; |