Merge branch 'topic/hda' into for-linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / sound / soc / codecs / cx20442.c

diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c
index 0bb424af956fb0377632d53a9bd6e2bcaadcccd9..d68ea532cc7f59a52e46be1a89ccf4d0c35ad518 100644 (file)
--- a/sound/soc/codecs/cx20442.c
+++ b/sound/soc/codecs/cx20442.c
@@ -86,18 +86,6 @@ static const struct snd_soc_dapm_route cx20442_audio_map[] = {
        {"ADC", NULL, "Input Mixer"},
 };
 
-static int cx20442_add_widgets(struct snd_soc_codec *codec)
-{
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       snd_soc_dapm_new_controls(dapm, cx20442_dapm_widgets,
-                                 ARRAY_SIZE(cx20442_dapm_widgets));
-       snd_soc_dapm_add_routes(dapm, cx20442_audio_map,
-                               ARRAY_SIZE(cx20442_audio_map));
-
-       return 0;
-}
-
 static unsigned int cx20442_read_reg_cache(struct snd_soc_codec *codec,
                                                        unsigned int reg)
 {
@@ -344,8 +332,6 @@ static int cx20442_codec_probe(struct snd_soc_codec *codec)
                return -ENOMEM;
        snd_soc_codec_set_drvdata(codec, cx20442);
 
-       cx20442_add_widgets(codec);
-
        cx20442->control_data = NULL;
        codec->hw_write = NULL;
        codec->card->pop_time = 0;
@@ -377,6 +363,10 @@ static struct snd_soc_codec_driver cx20442_codec_dev = {
        .reg_word_size = sizeof(u8),
        .read = cx20442_read_reg_cache,
        .write = cx20442_write,
+       .dapm_widgets = cx20442_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets),
+       .dapm_routes = cx20442_audio_map,
+       .num_dapm_routes = ARRAY_SIZE(cx20442_audio_map),
 };
 
 static int cx20442_platform_probe(struct platform_device *pdev)