Commit 597da2e4 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ice1724: Use snd_ctl_enum_info() 



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

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

sound/pci/ice1712/aureon.c

+8 −38
Original line number Diff line number Diff line
@@ -205,13 +205,7 @@ static int aureon_universe_inmux_info(struct snd_kcontrol *kcontrol, 
	static const char * const texts[3] =

		{"Internal Aux", "Wavetable", "Rear Line-In"};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 3;

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

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

	return 0;

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

}



static int aureon_universe_inmux_get(struct snd_kcontrol *kcontrol,
@@ -1106,20 +1100,10 @@ static int wm_adc_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_in 
	};

	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 2;

	if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE) {

		uinfo->value.enumerated.items = 8;

		if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

			uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

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

	} else {

		uinfo->value.enumerated.items = 5;

		if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

			uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

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

	}

	return 0;

	if (ice->eeprom.subvendor == VT1724_SUBDEVICE_AUREON71_UNIVERSE)

		return snd_ctl_enum_info(uinfo, 2, 8, universe_texts);

	else

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

}



static int wm_adc_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
@@ -1167,16 +1151,10 @@ static int aureon_cs8415_mux_info(struct snd_kcontrol *kcontrol, struct snd_ctl_ 
		"CD",

		"Coax"

	};

	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

	if (ice->eeprom.subvendor == VT1724_SUBDEVICE_PRODIGY71)

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

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

	else

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

	return 0;

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

}



static int aureon_cs8415_mux_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
@@ -1392,15 +1370,7 @@ static int aureon_oversampling_info(struct snd_kcontrol *k, struct snd_ctl_elem_ 
{

	static const char * const texts[2] = { "128x", "64x"	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;



	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

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



	return 0;

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

}



static int aureon_oversampling_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)

sound/pci/ice1712/ice1724.c

+1 −7
Original line number Diff line number Diff line
@@ -2049,13 +2049,7 @@ static int snd_vt1724_pro_route_info(struct snd_kcontrol *kcontrol, 
		"IEC958 In L", "IEC958 In R", /* 3-4 */

	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 5;

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

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

	return 0;

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

}



static inline int analog_route_shift(int idx)

sound/pci/ice1712/maya44.c

+2 −18
Original line number Diff line number Diff line
@@ -359,15 +359,7 @@ static int maya_rec_src_info(struct snd_kcontrol *kcontrol, 
{

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



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = ARRAY_SIZE(texts);

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item =

			uinfo->value.enumerated.items - 1;

	strcpy(uinfo->value.enumerated.name,

	       texts[uinfo->value.enumerated.item]);

	return 0;

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

}



static int maya_rec_src_get(struct snd_kcontrol *kcontrol,
@@ -411,15 +403,7 @@ static int maya_pb_route_info(struct snd_kcontrol *kcontrol, 
		"Input 1", "Input 2", "Input 3", "Input 4"

	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = ARRAY_SIZE(texts);

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item =

			uinfo->value.enumerated.items - 1;

	strcpy(uinfo->value.enumerated.name,

	       texts[uinfo->value.enumerated.item]);

	return 0;

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

}



static int maya_pb_route_shift(int idx)

sound/pci/ice1712/phase.c

+1 −11
Original line number Diff line number Diff line
@@ -723,17 +723,7 @@ static int phase28_oversampling_info(struct snd_kcontrol *k, 
{

	static const char * const texts[2] = { "128x", "64x"	};



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 2;



	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item = uinfo->value.enumerated.items -

						1;

	strcpy(uinfo->value.enumerated.name,

		texts[uinfo->value.enumerated.item]);



	return 0;

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

}



static int phase28_oversampling_get(struct snd_kcontrol *kcontrol,

sound/pci/ice1712/pontis.c

+1 −7
Original line number Diff line number Diff line
@@ -417,13 +417,7 @@ static int cs_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_inf 
		"Optical",	/* RXP1 */

		"CD",		/* RXP2 */

	};

	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;

	uinfo->count = 1;

	uinfo->value.enumerated.items = 3;

	if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)

		uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;

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

	return 0;

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

}



static int cs_source_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)