Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e5853d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Return the created kcontrol in __snd_hda_add_vmaster() 



It'll be used for adding hooks in later patches.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2ad787e9

sound/pci/hda/hda_codec.c

+8 −1
Original line number Diff line number Diff line
@@ -2399,6 +2399,7 @@ static int init_slave_unmute(void *data, struct snd_kcontrol *slave) 
 * @slaves: slave control names (optional)

 * @suffix: suffix string to each slave name (optional)

 * @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

 * 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,

			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;

	int err;



	if (ctl_ret)

		*ctl_ret = NULL;



	err = map_slaves(codec, slaves, suffix, check_slave_present, NULL);

	if (err != 1) {

		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,

			   tlv ? init_slave_0dB : init_slave_unmute, kctl);



	if (ctl_ret)

		*ctl_ret = kctl;

	return 0;

}

EXPORT_SYMBOL_HDA(__snd_hda_add_vmaster);

sound/pci/hda/hda_local.h

+4 −3
Original line number Diff line number Diff line
@@ -141,9 +141,10 @@ 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,

			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) \

	__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);



/* amp value bits */

sound/pci/hda/patch_analog.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int ad198x_build_controls(struct hda_codec *codec) 
					  (spec->slave_vols ?

					   spec->slave_vols : ad_slave_pfxs),

					  "Playback Volume",

					  !spec->avoid_init_slave_vol);

					  !spec->avoid_init_slave_vol, NULL);

		if (err < 0)

			return err;

	}