ALSA: hda - Return the created kcontrol in __snd_hda_add_vmaster()
It'll be used for adding hooks in later patches. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
2ad787e9aa
commit
29e5853d61
|
@ -2399,6 +2399,7 @@ static int init_slave_unmute(void *data, struct snd_kcontrol *slave)
|
||||||
* @slaves: slave control names (optional)
|
* @slaves: slave control names (optional)
|
||||||
* @suffix: suffix string to each slave name (optional)
|
* @suffix: suffix string to each slave name (optional)
|
||||||
* @init_slave_vol: initialize slaves to unmute/0dB
|
* @init_slave_vol: initialize slaves to unmute/0dB
|
||||||
|
* @ctl_ret: store the vmaster kcontrol in return
|
||||||
*
|
*
|
||||||
* Create a virtual master control with the given name. The TLV data
|
* Create a virtual master control with the given name. The TLV data
|
||||||
* must be either NULL or a valid data.
|
* must be either NULL or a valid data.
|
||||||
|
@ -2411,11 +2412,15 @@ static int init_slave_unmute(void *data, struct snd_kcontrol *slave)
|
||||||
*/
|
*/
|
||||||
int __snd_hda_add_vmaster(struct hda_codec *codec, 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, bool init_slave_vol)
|
const char *suffix, bool init_slave_vol,
|
||||||
|
struct snd_kcontrol **ctl_ret)
|
||||||
{
|
{
|
||||||
struct snd_kcontrol *kctl;
|
struct snd_kcontrol *kctl;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
if (ctl_ret)
|
||||||
|
*ctl_ret = NULL;
|
||||||
|
|
||||||
err = map_slaves(codec, slaves, suffix, check_slave_present, NULL);
|
err = map_slaves(codec, slaves, suffix, check_slave_present, NULL);
|
||||||
if (err != 1) {
|
if (err != 1) {
|
||||||
snd_printdd("No slave found for %s\n", name);
|
snd_printdd("No slave found for %s\n", name);
|
||||||
|
@ -2439,6 +2444,8 @@ int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
|
||||||
map_slaves(codec, slaves, suffix,
|
map_slaves(codec, slaves, suffix,
|
||||||
tlv ? init_slave_0dB : init_slave_unmute, kctl);
|
tlv ? init_slave_0dB : init_slave_unmute, kctl);
|
||||||
|
|
||||||
|
if (ctl_ret)
|
||||||
|
*ctl_ret = kctl;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_HDA(__snd_hda_add_vmaster);
|
EXPORT_SYMBOL_HDA(__snd_hda_add_vmaster);
|
||||||
|
|
|
@ -140,10 +140,11 @@ 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,
|
struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
|
||||||
const char *name);
|
const char *name);
|
||||||
int __snd_hda_add_vmaster(struct hda_codec *codec, 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, bool init_slave_vol);
|
const char *suffix, bool init_slave_vol,
|
||||||
|
struct snd_kcontrol **ctl_ret);
|
||||||
#define snd_hda_add_vmaster(codec, name, tlv, slaves, suffix) \
|
#define snd_hda_add_vmaster(codec, name, tlv, slaves, suffix) \
|
||||||
__snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true)
|
__snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true, NULL)
|
||||||
int snd_hda_codec_reset(struct hda_codec *codec);
|
int snd_hda_codec_reset(struct hda_codec *codec);
|
||||||
|
|
||||||
/* amp value bits */
|
/* amp value bits */
|
||||||
|
|
|
@ -229,7 +229,7 @@ static int ad198x_build_controls(struct hda_codec *codec)
|
||||||
(spec->slave_vols ?
|
(spec->slave_vols ?
|
||||||
spec->slave_vols : ad_slave_pfxs),
|
spec->slave_vols : ad_slave_pfxs),
|
||||||
"Playback Volume",
|
"Playback Volume",
|
||||||
!spec->avoid_init_slave_vol);
|
!spec->avoid_init_slave_vol, NULL);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue