ASoC: twl4030: Remove check defaults functionality

No need to keep the check defaults functionality anymore.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index a09da09103391cdbad66b372e0abe3ec36e3ceac..2937a9472b941859834923c6f44e694e5b79b766 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -670,7 +670,6 @@ struct twl4030_codec_data {
        unsigned int digimic_delay; /* in ms */
        unsigned int ramp_delay_value;
        unsigned int offset_cncl_path;
-       unsigned int check_defaults:1;
        unsigned int reset_registers:1;
        unsigned int hs_extmute:1;
        int hs_extmute_gpio;

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 419108ae31dee7d4fbd5be6f2703caed54f56cd2..7b732ab70d2c6b27c10204b3bba41e792743d330 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -268,25 +268,6 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)
        udelay(10);
 }
 
-static inline void twl4030_check_defaults(struct snd_soc_codec *codec)
-{
-       int i, difference = 0;
-       u8 val;
-
-       dev_dbg(codec->dev, "Checking TWL audio default configuration\n");
-       for (i = 1; i <= TWL4030_REG_MISC_SET_2; i++) {
-               twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &val, i);
-               if (val != twl4030_reg[i]) {
-                       difference++;
-                       dev_dbg(codec->dev,
-                                "Reg 0x%02x: chip: 0x%02x driver: 0x%02x\n",
-                                i, val, twl4030_reg[i]);
-               }
-       }
-       dev_dbg(codec->dev, "Found %d non-matching registers. %s\n",
-                difference, difference ? "Not OK" : "OK");
-}
-
 static inline void twl4030_reset_registers(struct snd_soc_codec *codec)
 {
        int i;
@@ -378,10 +359,6 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
                }
        }
 
-       /* Check defaults, if instructed before anything else */
-       if (pdata && pdata->check_defaults)
-               twl4030_check_defaults(codec);
-
        /* Reset registers, if no setup data or if instructed to do so */
        if (!pdata || (pdata && pdata->reset_registers))
                twl4030_reset_registers(codec);