Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / sound / soc / codecs / sn95031.c

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index e879e5e0489e8c8a7de059fb10f3a22050b63710..1f451a1946eb259c4734b68a2e2f273279c35dec 100644 (file)
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -867,25 +867,16 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
        snd_soc_write(codec, SN95031_SSR2, 0x10);
        snd_soc_write(codec, SN95031_SSR3, 0x40);
 
-       snd_soc_add_codec_controls(codec, sn95031_snd_controls,
-                            ARRAY_SIZE(sn95031_snd_controls));
-
-       return 0;
-}
-
-static int sn95031_codec_remove(struct snd_soc_codec *codec)
-{
-       pr_debug("codec_remove called\n");
-       sn95031_set_vaud_bias(codec, SND_SOC_BIAS_OFF);
-
        return 0;
 }
 
 static struct snd_soc_codec_driver sn95031_codec = {
        .probe          = sn95031_codec_probe,
-       .remove         = sn95031_codec_remove,
        .set_bias_level = sn95031_set_vaud_bias,
        .idle_bias_off  = true,
+
+       .controls       = sn95031_snd_controls,
+       .num_controls   = ARRAY_SIZE(sn95031_snd_controls),
        .dapm_widgets   = sn95031_dapm_widgets,
        .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
        .dapm_routes    = sn95031_audio_map,