diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-02-03 14:28:01 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-02-03 14:28:01 +0100 |
| commit | 9322ca549771f2e84a93ac3f509ade1e4c3cdb35 (patch) | |
| tree | 464dd5828486ccedd5342a21a6607392b560af29 /sound/pci/hda/hda_local.h | |
| parent | Merge branch 'fix/hda' into topic/hda (diff) | |
| download | linux-9322ca549771f2e84a93ac3f509ade1e4c3cdb35.tar.xz linux-9322ca549771f2e84a93ac3f509ade1e4c3cdb35.zip | |
ALSA: hda - Add suffix argument to snd_hda_add_vmaster()
In most cases, the slave strings for vmaster are identical between
volumes and switches except for "xxx Volume" and "xxx Switch" suffix.
Now snd_hda_add_vmaster() takes the optional suffix argument so that
each string can be composed with the given suffix, and we can share the
slave name strings in both volume and switch calls nicely.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index aca8d3193b95..6094dea82bc3 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h @@ -140,7 +140,8 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir, struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, const char *name); int snd_hda_add_vmaster(struct hda_codec *codec, char *name, - unsigned int *tlv, const char * const *slaves); + unsigned int *tlv, const char * const *slaves, + const char *suffix); int snd_hda_codec_reset(struct hda_codec *codec); /* amp value bits */ |