diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-18 10:17:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-18 10:17:30 +0100 |
| commit | c970042c129fbda2017e537d284e61ef4966a140 (patch) | |
| tree | 96a08caca3c70a4e9ef81cbab5639ecd58396740 /sound/pci/hda/hda_generic.h | |
| parent | ALSA: hda - Keep autocfg.input idx value in imux table (diff) | |
| download | linux-c970042c129fbda2017e537d284e61ef4966a140.tar.xz linux-c970042c129fbda2017e537d284e61ef4966a140.zip | |
ALSA: hda - Unify input label creations in generic parser
There are a few places creating the labels and indices of kctls for
each input pin in the current generic parser code. This is redundant
and makes harder to maintain. Let's create the labels and indices at
once and keep them in hda_gen_spec.
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 7b14e9ce7486..f6b88cd4584f 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -105,6 +105,8 @@ struct hda_gen_spec { hda_nid_t adc_nids[AUTO_CFG_MAX_OUTS]; hda_nid_t dig_in_nid; /* digital-in NID; optional */ hda_nid_t mixer_nid; /* analog-mixer NID */ + const char *input_labels[AUTO_CFG_MAX_OUTS]; + int input_label_idxs[AUTO_CFG_MAX_OUTS]; /* capture setup for dynamic dual-adc switch */ hda_nid_t cur_adc; |