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

Commit 0401e854 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Move beep helper functions to hda_beep.c 



Move snd_hda_mixer_amp_switch_put_beep() to hda_beep.c as a clean up
to remove one more ifdef.

Also add the corresponding get callback to return consistently the
digital beep state independently from the mixer amp value.

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

sound/pci/hda/hda_beep.c

+28 −0
Original line number Diff line number Diff line
@@ -231,3 +231,31 @@ void snd_hda_detach_beep_device(struct hda_codec *codec) 
	}

}

EXPORT_SYMBOL_HDA(snd_hda_detach_beep_device);



/* get/put callbacks for beep mute mixer switches */

int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct hda_beep *beep = codec->beep;

	if (beep) {

		ucontrol->value.integer.value[0] =

			ucontrol->value.integer.value[1] =

			beep->enabled;

		return 0;

	}

	return snd_hda_mixer_amp_switch_get(kcontrol, ucontrol);

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_get_beep);



int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	struct hda_beep *beep = codec->beep;

	if (beep)

		snd_hda_enable_beep_device(codec,

					   *ucontrol->value.integer.value);

	return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);

sound/pci/hda/hda_codec.c

+0 −19
Original line number Diff line number Diff line
@@ -2676,25 +2676,6 @@ int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put);



#ifdef CONFIG_SND_HDA_INPUT_BEEP

/**

 * snd_hda_mixer_amp_switch_put_beep - Put callback for a beep AMP switch

 *

 * This function calls snd_hda_enable_beep_device(), which behaves differently

 * depending on beep_mode option.

 */

int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	long *valp = ucontrol->value.integer.value;



	snd_hda_enable_beep_device(codec, *valp);

	return snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);

}

EXPORT_SYMBOL_HDA(snd_hda_mixer_amp_switch_put_beep);

#endif /* CONFIG_SND_HDA_INPUT_BEEP */



/*

 * bound volume controls

 *

sound/pci/hda/hda_local.h

+3 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
	{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xcidx, \

	  .subdevice = HDA_SUBDEV_AMP_FLAG, \

	  .info = snd_hda_mixer_amp_switch_info, \

	  .get = snd_hda_mixer_amp_switch_get, \

	  .get = snd_hda_mixer_amp_switch_get_beep, \

	  .put = snd_hda_mixer_amp_switch_put_beep, \

	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }

#else
@@ -121,6 +121,8 @@ int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, 
int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol,

				 struct snd_ctl_elem_value *ucontrol);

#ifdef CONFIG_SND_HDA_INPUT_BEEP

int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_value *ucontrol);

int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,

				      struct snd_ctl_elem_value *ucontrol);

#endif