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

Commit 04eeb606 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: aoa: Use snd_ctl_elem_info() 



... and reduce the open codes.  Also add missing const to text arrays.

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

sound/aoa/codecs/onyx.c

+1 −7
Original line number Diff line number Diff line
@@ -243,13 +243,7 @@ static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol, 
{

	static const char * const texts[] = { "Line-In", "Microphone" };



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;

	if (uinfo->value.enumerated.item > 1)

		uinfo->value.enumerated.item = 1;

	strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(uinfo, 1, 2, texts);

}



static int onyx_snd_capture_source_get(struct snd_kcontrol *kcontrol,

sound/aoa/codecs/tas.c

+2 −8
Original line number Diff line number Diff line
@@ -478,15 +478,9 @@ static struct snd_kcontrol_new drc_switch_control = { 
static int tas_snd_capture_source_info(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo)

{

	static char *texts[] = { "Line-In", "Microphone" };

	static const char * const texts[] = { "Line-In", "Microphone" };



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;

	if (uinfo->value.enumerated.item > 1)

		uinfo->value.enumerated.item = 1;

	strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);

	return 0;

	return snd_ctl_enum_info(uinfo, 1, 2, texts);

}



static int tas_snd_capture_source_get(struct snd_kcontrol *kcontrol,