ASoC: twl6040: No need to change delay during HF ramp
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Mon, 26 Sep 2011 13:26:31 +0000 (16:26 +0300)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 26 Sep 2011 21:33:31 +0000 (22:33 +0100)
The Handsfree gain have 2dB steps all the way, so there is no
reason to have different delays as we approaching to the
end of the scale.
The comment was also wrong, since we have 0dB at 0x3 raw, at 16 the gain
is -26dB.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/twl6040.c

index 0144e435c08b1033629ed3db8ff2ec6328378a3f..c973347d4f6bee31ff65d63a1db82ba9c9ffc05e 100644 (file)
@@ -526,7 +526,6 @@ static void twl6040_pga_hf_work(struct work_struct *work)
                container_of(work, struct twl6040_data, handsfree.work.work);
        struct snd_soc_codec *codec = priv->codec;
        struct twl6040_output *handsfree = &priv->handsfree;
-       unsigned int delay = handsfree->step_delay;
        int i, handsfree_complete;
 
        /* do we need to ramp at all ? */
@@ -543,15 +542,8 @@ static void twl6040_pga_hf_work(struct work_struct *work)
                if (handsfree_complete)
                        break;
 
-               /*
-                * TODO: tune: delay is longer over 0dB
-                * as increases are larger.
-                */
-               if (i >= 16)
-                       schedule_timeout_interruptible(msecs_to_jiffies(delay +
-                                                      (delay >> 1)));
-               else
-                       schedule_timeout_interruptible(msecs_to_jiffies(delay));
+               schedule_timeout_interruptible(
+                               msecs_to_jiffies(handsfree->step_delay));
        }