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: Takashi Iwai <tiwai@suse.de> Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
此提交包含在:
@@ -3237,7 +3237,7 @@ static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994)
|
||||
dev_dbg(codec->dev, "Allocated %d unique ReTune Mobile names\n",
|
||||
wm8994->num_retune_mobile_texts);
|
||||
|
||||
wm8994->retune_mobile_enum.max = wm8994->num_retune_mobile_texts;
|
||||
wm8994->retune_mobile_enum.items = wm8994->num_retune_mobile_texts;
|
||||
wm8994->retune_mobile_enum.texts = wm8994->retune_mobile_texts;
|
||||
|
||||
ret = snd_soc_add_codec_controls(wm8994->hubs.codec, controls,
|
||||
@@ -3293,7 +3293,7 @@ static void wm8994_handle_pdata(struct wm8994_priv *wm8994)
|
||||
for (i = 0; i < pdata->num_drc_cfgs; i++)
|
||||
wm8994->drc_texts[i] = pdata->drc_cfgs[i].name;
|
||||
|
||||
wm8994->drc_enum.max = pdata->num_drc_cfgs;
|
||||
wm8994->drc_enum.items = pdata->num_drc_cfgs;
|
||||
wm8994->drc_enum.texts = wm8994->drc_texts;
|
||||
|
||||
ret = snd_soc_add_codec_controls(wm8994->hubs.codec, controls,
|
||||
|
新增問題並參考
封鎖使用者