Commit 9a8d38db authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: Rename soc_enum.max field with items 



The name "max" in struct soc_enum is rather confusing since it
actually takes the number of items.  With "max", one might try to
assign (nitems - 1) value.

Rename the field to a more appropriate one, "items", which is also
used in struct snd_ctl_elem_info, too.

This patch also rewrites some code like "if (x > e->nitems - 1)" with
"if (x >= e->nitems)".  Not only the latter improves the readability,
it also fixes a potential bug when e->items is zero.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

include/sound/soc.h

+12 −12
Original line number Diff line number Diff line
@@ -162,19 +162,19 @@ 
	.private_value = (unsigned long)&(struct soc_mixer_control) \

		{.reg = xreg, .min = xmin, .max = xmax, \

		 .platform_max = xmax} }

#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmax, xtexts) \

#define SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xitems, xtexts) \

{	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \

	.max = xmax, .texts = xtexts, \

	.mask = xmax ? roundup_pow_of_two(xmax) - 1 : 0}

#define SOC_ENUM_SINGLE(xreg, xshift, xmax, xtexts) \

	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xmax, xtexts)

#define SOC_ENUM_SINGLE_EXT(xmax, xtexts) \

{	.max = xmax, .texts = xtexts }

#define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xmax, xtexts, xvalues) \

	.items = xitems, .texts = xtexts, \

	.mask = xitems ? roundup_pow_of_two(xitems) - 1 : 0}

#define SOC_ENUM_SINGLE(xreg, xshift, xitems, xtexts) \

	SOC_ENUM_DOUBLE(xreg, xshift, xshift, xitems, xtexts)

#define SOC_ENUM_SINGLE_EXT(xitems, xtexts) \

{	.items = xitems, .texts = xtexts }

#define SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, xitems, xtexts, xvalues) \

{	.reg = xreg, .shift_l = xshift_l, .shift_r = xshift_r, \

	.mask = xmask, .max = xmax, .texts = xtexts, .values = xvalues}

#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xmax, xtexts, xvalues) \

	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xmax, xtexts, xvalues)

	.mask = xmask, .items = xitems, .texts = xtexts, .values = xvalues}

#define SOC_VALUE_ENUM_SINGLE(xreg, xshift, xmask, xnitmes, xtexts, xvalues) \

	SOC_VALUE_ENUM_DOUBLE(xreg, xshift, xshift, xmask, xnitmes, xtexts, xvalues)

#define SOC_ENUM(xname, xenum) \

{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\

	.info = snd_soc_info_enum_double, \
@@ -1089,7 +1089,7 @@ struct soc_enum { 
	unsigned short reg2;

	unsigned char shift_l;

	unsigned char shift_r;

	unsigned int max;

	unsigned int items;

	unsigned int mask;

	const char * const *texts;

	const unsigned int *values;

sound/soc/codecs/max98088.c

+1 −1
Original line number Diff line number Diff line
@@ -1849,7 +1849,7 @@ static void max98088_handle_eq_pdata(struct snd_soc_codec *codec) 


       /* Now point the soc_enum to .texts array items */

       max98088->eq_enum.texts = max98088->eq_texts;

       max98088->eq_enum.max = max98088->eq_textcnt;

       max98088->eq_enum.items = max98088->eq_textcnt;



       ret = snd_soc_add_codec_controls(codec, controls, ARRAY_SIZE(controls));

       if (ret != 0)

sound/soc/codecs/max98095.c

+2 −2
Original line number Diff line number Diff line
@@ -1861,7 +1861,7 @@ static void max98095_handle_eq_pdata(struct snd_soc_codec *codec) 


	/* Now point the soc_enum to .texts array items */

	max98095->eq_enum.texts = max98095->eq_texts;

	max98095->eq_enum.max = max98095->eq_textcnt;

	max98095->eq_enum.items = max98095->eq_textcnt;



	ret = snd_soc_add_codec_controls(codec, controls, ARRAY_SIZE(controls));

	if (ret != 0)
@@ -2016,7 +2016,7 @@ static void max98095_handle_bq_pdata(struct snd_soc_codec *codec) 


	/* Now point the soc_enum to .texts array items */

	max98095->bq_enum.texts = max98095->bq_texts;

	max98095->bq_enum.max = max98095->bq_textcnt;

	max98095->bq_enum.items = max98095->bq_textcnt;



	ret = snd_soc_add_codec_controls(codec, controls, ARRAY_SIZE(controls));

	if (ret != 0)

sound/soc/codecs/twl4030.c

+2 −2
Original line number Diff line number Diff line
@@ -975,13 +975,13 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol, 
		return -EBUSY;

	}



	if (ucontrol->value.enumerated.item[0] > e->max - 1)

	if (ucontrol->value.enumerated.item[0] >= e->items)

		return -EINVAL;



	val = ucontrol->value.enumerated.item[0] << e->shift_l;

	mask = e->mask << e->shift_l;

	if (e->shift_l != e->shift_r) {

		if (ucontrol->value.enumerated.item[1] > e->max - 1)

		if (ucontrol->value.enumerated.item[1] >= e->items)

			return -EINVAL;

		val |= ucontrol->value.enumerated.item[1] << e->shift_r;

		mask |= e->mask << e->shift_r;

sound/soc/codecs/wm8904.c

+2 −2
Original line number Diff line number Diff line
@@ -1981,7 +1981,7 @@ static void wm8904_handle_retune_mobile_pdata(struct snd_soc_codec *codec) 
	dev_dbg(codec->dev, "Allocated %d unique ReTune Mobile names\n",

		wm8904->num_retune_mobile_texts);



	wm8904->retune_mobile_enum.max = wm8904->num_retune_mobile_texts;

	wm8904->retune_mobile_enum.items = wm8904->num_retune_mobile_texts;

	wm8904->retune_mobile_enum.texts = wm8904->retune_mobile_texts;



	ret = snd_soc_add_codec_controls(codec, &control, 1);
@@ -2022,7 +2022,7 @@ static void wm8904_handle_pdata(struct snd_soc_codec *codec) 
		for (i = 0; i < pdata->num_drc_cfgs; i++)

			wm8904->drc_texts[i] = pdata->drc_cfgs[i].name;



		wm8904->drc_enum.max = pdata->num_drc_cfgs;

		wm8904->drc_enum.items = pdata->num_drc_cfgs;

		wm8904->drc_enum.texts = wm8904->drc_texts;



		ret = snd_soc_add_codec_controls(codec, &control, 1);

CRA Git | Maintained and supported by SUSTech CRA and CCSE