ASoC: Avoid recalculating the bitmask for SOC_ENUM controls

For ENUM controls the bitmask is calculated based on the number of items.
Currently this is done each time the control is accessed. And while the
performance impact of this should be negligible we can easily do better. The
roundup_pow_of_two macro performs the same calculation which is currently done
manually, but it is also possible to use this macro with compile time constants
and so it can be used to initialize static data. So we can use it to initialize
the mask field of a ENUM control during its declaration.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

3 files changed, 17 insertions, 29 deletions

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 391fcfc7b63b..2548f5c56885 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -999,7 +999,7 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned short val;
-        unsigned short mask, bitmask;
+        unsigned short mask;
 
         if (twl4030->configured) {
                 dev_err(codec->dev,
@@ -1007,18 +1007,16 @@ static int snd_soc_put_twl4030_opmode_enum_double(struct snd_kcontrol *kcontrol,
                 return -EBUSY;
         }
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
 
         val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = (bitmask - 1) << 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)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         return snd_soc_update_bits(codec, e->reg, mask, val);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e5b0713e6f3c..9a6daf997319 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2413,16 +2413,14 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
 {
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        unsigned int val, bitmask;
+        unsigned int val;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         val = snd_soc_read(codec, e->reg);
         ucontrol->value.enumerated.item[0]
-                = (val >> e->shift_l) & (bitmask - 1);
+                = (val >> e->shift_l) & e->mask;
         if (e->shift_l != e->shift_r)
                 ucontrol->value.enumerated.item[1] =
-                        (val >> e->shift_r) & (bitmask - 1);
+                        (val >> e->shift_r) & e->mask;
 
         return 0;
 }
@@ -2443,19 +2441,17 @@ int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val;
-        unsigned int mask, bitmask;
+        unsigned int mask;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
         val = ucontrol->value.enumerated.item[0] << e->shift_l;
-        mask = (bitmask - 1) << 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)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         return snd_soc_update_bits_locked(codec, e->reg, mask, val);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f7999e949acb..a18d115bc507 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -355,12 +355,10 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
         case snd_soc_dapm_mux: {
                 struct soc_enum *e = (struct soc_enum *)
                         w->kcontrol_news[i].private_value;
-                int val, item, bitmask;
+                int val, item;
 
-                for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                        ;
                 val = soc_widget_read(w, e->reg);
-                item = (val >> e->shift_l) & (bitmask - 1);
+                item = (val >> e->shift_l) & e->mask;
 
                 p->connect = 0;
                 for (i = 0; i < e->max; i++) {
@@ -2677,15 +2675,13 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
         struct snd_soc_dapm_widget *widget = wlist->widgets[0];
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
-        unsigned int val, bitmask;
+        unsigned int val;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         val = snd_soc_read(widget->codec, e->reg);
-        ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & (bitmask - 1);
+        ucontrol->value.enumerated.item[0] = (val >> e->shift_l) & e->mask;
         if (e->shift_l != e->shift_r)
                 ucontrol->value.enumerated.item[1] =
-                        (val >> e->shift_r) & (bitmask - 1);
+                        (val >> e->shift_r) & e->mask;
 
         return 0;
 }
@@ -2709,22 +2705,20 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
         struct snd_soc_card *card = codec->card;
         struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
         unsigned int val, mux, change;
-        unsigned int mask, bitmask;
+        unsigned int mask;
         struct snd_soc_dapm_update update;
         int wi;
 
-        for (bitmask = 1; bitmask < e->max; bitmask <<= 1)
-                ;
         if (ucontrol->value.enumerated.item[0] > e->max - 1)
                 return -EINVAL;
         mux = ucontrol->value.enumerated.item[0];
         val = mux << e->shift_l;
-        mask = (bitmask - 1) << 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)
                         return -EINVAL;
                 val |= ucontrol->value.enumerated.item[1] << e->shift_r;
-                mask |= (bitmask - 1) << e->shift_r;
+                mask |= e->mask << e->shift_r;
         }
 
         mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);