Merge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'asoc...

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / sound / soc / codecs / da732x.c

diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c
index 2fae31c..61b2f9a 100644 (file)
--- a/sound/soc/codecs/da732x.c
+++ b/sound/soc/codecs/da732x.c
@@ -35,7 +35,6 @@
 
 struct da732x_priv {
        struct regmap *regmap;
-       struct snd_soc_codec *codec;
 
        unsigned int sysclk;
        bool pll_en;
@@ -217,7 +216,7 @@ static void da732x_set_charge_pump(struct snd_soc_codec *codec, int state)
                snd_soc_write(codec, DA732X_REG_CP_CTRL1, DA723X_CP_DIS);
                break;
        default:
-               pr_err(KERN_ERR "Wrong charge pump state\n");
+               pr_err("Wrong charge pump state\n");
                break;
        }
 }
@@ -1508,31 +1507,7 @@ static int da732x_set_bias_level(struct snd_soc_codec *codec,
        return 0;
 }
 
-static int da732x_probe(struct snd_soc_codec *codec)
-{
-       struct da732x_priv *da732x = snd_soc_codec_get_drvdata(codec);
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       da732x->codec = codec;
-
-       dapm->idle_bias_off = false;
-
-       da732x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-       return 0;
-}
-
-static int da732x_remove(struct snd_soc_codec *codec)
-{
-
-       da732x_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-       return 0;
-}
-
 static struct snd_soc_codec_driver soc_codec_dev_da732x = {
-       .probe                  = da732x_probe,
-       .remove                 = da732x_remove,
        .set_bias_level         = da732x_set_bias_level,
        .controls               = da732x_snd_controls,
        .num_controls           = ARRAY_SIZE(da732x_snd_controls),