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>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9a001472b96a4bf8a11c8c129543060fdb75c869..66de6a70581e57d0bd41b332eb54db1af6f8e2a9 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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;

diff --git a/sound/soc/codecs/max98088.c b/sound/soc/codecs/max98088.c
index ee660e2d3df3ba0ced0587ee13bab59fc86de6f9..bb1ecfc4459b06bf31e0699f794d34af7601b838 100644 (file)
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -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)

diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 3ba1170ebb53dcdb05d56e043121d83f3a20cbfe..5bce9cde4a6dc57becc23d7c4d96408d187b0d6b 100644 (file)
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -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)

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 00665ada23e20bf37bc2b5e1af81b2a5afe3332e..1eb13d586309fe9010e48ad750df95ce7124033e 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -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;

diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c
index 53bbfac6a83ad14ed43d2aafca2514ea3a319468..b2664ec901b9e7072fc7a7b2b175ddac8f7ed305 100644 (file)
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
@@ -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);

diff --git a/sound/soc/codecs/wm8958-dsp2.c b/sound/soc/codecs/wm8958-dsp2.c
index b7488f190d2bc9d5b86da537a560fc6be9f6ca0a..19743779bf4d2c15c1379be13ff86d9f8ecba198 100644 (file)
--- a/sound/soc/codecs/wm8958-dsp2.c
+++ b/sound/soc/codecs/wm8958-dsp2.c
@@ -944,7 +944,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                for (i = 0; i < pdata->num_mbc_cfgs; i++)
                        wm8994->mbc_texts[i] = pdata->mbc_cfgs[i].name;
 
-               wm8994->mbc_enum.max = pdata->num_mbc_cfgs;
+               wm8994->mbc_enum.items = pdata->num_mbc_cfgs;
                wm8994->mbc_enum.texts = wm8994->mbc_texts;
 
                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
@@ -973,7 +973,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                for (i = 0; i < pdata->num_vss_cfgs; i++)
                        wm8994->vss_texts[i] = pdata->vss_cfgs[i].name;
 
-               wm8994->vss_enum.max = pdata->num_vss_cfgs;
+               wm8994->vss_enum.items = pdata->num_vss_cfgs;
                wm8994->vss_enum.texts = wm8994->vss_texts;
 
                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
@@ -1003,7 +1003,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                for (i = 0; i < pdata->num_vss_hpf_cfgs; i++)
                        wm8994->vss_hpf_texts[i] = pdata->vss_hpf_cfgs[i].name;
 
-               wm8994->vss_hpf_enum.max = pdata->num_vss_hpf_cfgs;
+               wm8994->vss_hpf_enum.items = pdata->num_vss_hpf_cfgs;
                wm8994->vss_hpf_enum.texts = wm8994->vss_hpf_texts;
 
                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,
@@ -1034,7 +1034,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
                for (i = 0; i < pdata->num_enh_eq_cfgs; i++)
                        wm8994->enh_eq_texts[i] = pdata->enh_eq_cfgs[i].name;
 
-               wm8994->enh_eq_enum.max = pdata->num_enh_eq_cfgs;
+               wm8994->enh_eq_enum.items = pdata->num_enh_eq_cfgs;
                wm8994->enh_eq_enum.texts = wm8994->enh_eq_texts;
 
                ret = snd_soc_add_codec_controls(wm8994->hubs.codec,

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index b9be9cbc460391d4530e970e3c77a0521109c2a2..8253c3c6db0e7f319b7db3cafd952c4aa737441d 100644 (file)
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -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,

diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c
index 1a7655b0aa2230890df4f5b82c34a609f7128f05..ea6b587f65c132c727fe8517c40690ec50fc9185 100644 (file)
--- a/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@ -2595,7 +2595,7 @@ static void wm8996_retune_mobile_pdata(struct snd_soc_codec *codec)
        dev_dbg(codec->dev, "Allocated %d unique ReTune Mobile names\n",
                wm8996->num_retune_mobile_texts);
 
-       wm8996->retune_mobile_enum.max = wm8996->num_retune_mobile_texts;
+       wm8996->retune_mobile_enum.items = wm8996->num_retune_mobile_texts;
        wm8996->retune_mobile_enum.texts = wm8996->retune_mobile_texts;
 
        ret = snd_soc_add_codec_controls(codec, controls, ARRAY_SIZE(controls));

diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 629446482a917267706c76982863577a426da11c..2eca91a51f51d4cf29964f70e65ca26461030ec3 100644 (file)
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -103,7 +103,7 @@ static int ams_delta_set_audio_mode(struct snd_kcontrol *kcontrol,
        if (!codec->hw_write)
                return -EUNATCH;
 
-       if (ucontrol->value.enumerated.item[0] >= control->max)
+       if (ucontrol->value.enumerated.item[0] >= control->items)
                return -EINVAL;
 
        mutex_lock(&codec->mutex);

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fe1df50805a3035ea455d40771c55d4cb4f6585d..4372efb4e033423f9a2cde571805e6189f72eb7a 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2571,10 +2571,10 @@ int snd_soc_info_enum_double(struct snd_kcontrol *kcontrol,
 
        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
        uinfo->count = e->shift_l == e->shift_r ? 1 : 2;
-       uinfo->value.enumerated.items = e->max;
+       uinfo->value.enumerated.items = e->items;
 
-       if (uinfo->value.enumerated.item > e->max - 1)
-               uinfo->value.enumerated.item = e->max - 1;
+       if (uinfo->value.enumerated.item >= e->items)
+               uinfo->value.enumerated.item = e->items - 1;
        strlcpy(uinfo->value.enumerated.name,
                e->texts[uinfo->value.enumerated.item],
                sizeof(uinfo->value.enumerated.name));
@@ -2626,12 +2626,12 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
        unsigned int val;
        unsigned int mask;
 
-       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;
@@ -2662,14 +2662,14 @@ int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol,
 
        reg_val = snd_soc_read(codec, e->reg);
        val = (reg_val >> e->shift_l) & e->mask;
-       for (mux = 0; mux < e->max; mux++) {
+       for (mux = 0; mux < e->items; mux++) {
                if (val == e->values[mux])
                        break;
        }
        ucontrol->value.enumerated.item[0] = mux;
        if (e->shift_l != e->shift_r) {
                val = (reg_val >> e->shift_r) & e->mask;
-               for (mux = 0; mux < e->max; mux++) {
+               for (mux = 0; mux < e->items; mux++) {
                        if (val == e->values[mux])
                                break;
                }
@@ -2700,12 +2700,12 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol,
        unsigned int val;
        unsigned int mask;
 
-       if (ucontrol->value.enumerated.item[0] > e->max - 1)
+       if (ucontrol->value.enumerated.item[0] >= e->items)
                return -EINVAL;
        val = e->values[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 |= e->values[ucontrol->value.enumerated.item[1]] << e->shift_r;
                mask |= e->mask << e->shift_r;

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index dc8ff13187f7ca91ef960312f48eac732c44d938..2026a64a0afba9b9fc5e252ac39155facc62651c 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -535,7 +535,7 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
                soc_widget_read(w, e->reg, &val);
                item = (val >> e->shift_l) & e->mask;
 
-               if (item < e->max && !strcmp(p->name, e->texts[item]))
+               if (item < e->items && !strcmp(p->name, e->texts[item]))
                        p->connect = 1;
                else
                        p->connect = 0;
@@ -563,12 +563,12 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
 
                soc_widget_read(w, e->reg, &val);
                val = (val >> e->shift_l) & e->mask;
-               for (item = 0; item < e->max; item++) {
+               for (item = 0; item < e->items; item++) {
                        if (val == e->values[item])
                                break;
                }
 
-               if (item < e->max && !strcmp(p->name, e->texts[item]))
+               if (item < e->items && !strcmp(p->name, e->texts[item]))
                        p->connect = 1;
                else
                        p->connect = 0;
@@ -616,7 +616,7 @@ static int dapm_connect_mux(struct snd_soc_dapm_context *dapm,
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        int i;
 
-       for (i = 0; i < e->max; i++) {
+       for (i = 0; i < e->items; i++) {
                if (!(strcmp(control_name, e->texts[i]))) {
                        list_add(&path->list, &dapm->card->paths);
                        list_add(&path->list_sink, &dest->sources);
@@ -2967,13 +2967,13 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
        struct snd_soc_dapm_update update;
        int ret = 0;
 
-       if (ucontrol->value.enumerated.item[0] > e->max - 1)
+       if (ucontrol->value.enumerated.item[0] >= e->items)
                return -EINVAL;
        mux = ucontrol->value.enumerated.item[0];
        val = mux << 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;
@@ -3036,7 +3036,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
        int change;
        int ret = 0;
 
-       if (ucontrol->value.enumerated.item[0] >= e->max)
+       if (ucontrol->value.enumerated.item[0] >= e->items)
                return -EINVAL;
 
        mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
@@ -3077,14 +3077,14 @@ int snd_soc_dapm_get_value_enum_double(struct snd_kcontrol *kcontrol,
 
        reg_val = snd_soc_read(codec, e->reg);
        val = (reg_val >> e->shift_l) & e->mask;
-       for (mux = 0; mux < e->max; mux++) {
+       for (mux = 0; mux < e->items; mux++) {
                if (val == e->values[mux])
                        break;
        }
        ucontrol->value.enumerated.item[0] = mux;
        if (e->shift_l != e->shift_r) {
                val = (reg_val >> e->shift_r) & e->mask;
-               for (mux = 0; mux < e->max; mux++) {
+               for (mux = 0; mux < e->items; mux++) {
                        if (val == e->values[mux])
                                break;
                }
@@ -3119,13 +3119,13 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol,
        struct snd_soc_dapm_update update;
        int ret = 0;
 
-       if (ucontrol->value.enumerated.item[0] > e->max - 1)
+       if (ucontrol->value.enumerated.item[0] >= e->items)
                return -EINVAL;
        mux = ucontrol->value.enumerated.item[0];
        val = e->values[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 |= e->values[ucontrol->value.enumerated.item[1]] << e->shift_r;
                mask |= e->mask << e->shift_r;