ASoC: Rename soc_enum.max field with items

[deliverable/linux.git] / sound / soc / soc-core.c

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;