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

Commit de95eae2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ca0106: Use snd_ctl_enum_info() 



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

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

sound/pci/ca0106/ca0106_mixer.c

+8 −32
Original line number Diff line number Diff line
@@ -185,17 +185,11 @@ static int snd_ca0106_shared_spdif_put(struct snd_kcontrol *kcontrol, 
static int snd_ca0106_capture_source_info(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_info *uinfo)

{

	static char *texts[6] = {

	static const char * const texts[6] = {

		"IEC958 out", "i2s mixer out", "IEC958 in", "i2s in", "AC97 in", "SRC out"

	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 6;

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

                uinfo->value.enumerated.item = 5;

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

	return 0;

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

}



static int snd_ca0106_capture_source_get(struct snd_kcontrol *kcontrol,
@@ -228,17 +222,11 @@ static int snd_ca0106_capture_source_put(struct snd_kcontrol *kcontrol, 
static int snd_ca0106_i2c_capture_source_info(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_info *uinfo)

{

	static char *texts[6] = {

	static const char * const texts[4] = {

		"Phone", "Mic", "Line in", "Aux"

	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 4;

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

                uinfo->value.enumerated.item = 3;

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

	return 0;

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

}



static int snd_ca0106_i2c_capture_source_get(struct snd_kcontrol *kcontrol,
@@ -273,29 +261,17 @@ static int snd_ca0106_i2c_capture_source_put(struct snd_kcontrol *kcontrol, 
static int snd_ca0106_capture_line_in_side_out_info(struct snd_kcontrol *kcontrol,

					       struct snd_ctl_elem_info *uinfo)

{

	static char *texts[2] = { "Side out", "Line in" };

	static const char * const texts[2] = { "Side out", "Line in" };



	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 snd_ca0106_capture_mic_line_in_info(struct snd_kcontrol *kcontrol,

					       struct snd_ctl_elem_info *uinfo)

{

	static char *texts[2] = { "Line in", "Mic in" };

	static const char * const texts[2] = { "Line in", "Mic in" };



	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 snd_ca0106_capture_mic_line_in_get(struct snd_kcontrol *kcontrol,