ASoC: constify snd_soc_codec_driver structures

[karo-tx-linux.git] / sound / soc / codecs / wm8753.c

diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 6f1024f48b193bc7d3127cc8b12d56d14124413b..9bdf5447f6f60fcdace934194f2c81337e4c5195 100644 (file)
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -32,7 +32,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -486,7 +485,7 @@ SND_SOC_DAPM_DAC("Voice DAC", "Voice Playback", WM8753_PWR1, 4, 0),
 SND_SOC_DAPM_OUTPUT("MONO1"),
 SND_SOC_DAPM_MUX("Mono 2 Mux", SND_SOC_NOPM, 0, 0, &wm8753_mono2_controls),
 SND_SOC_DAPM_OUTPUT("MONO2"),
-SND_SOC_DAPM_MIXER("Out3 Left + Right", -1, 0, 0, NULL, 0),
+SND_SOC_DAPM_MIXER("Out3 Left + Right", SND_SOC_NOPM, 0, 0, NULL, 0),
 SND_SOC_DAPM_MUX("Out3 Mux", SND_SOC_NOPM, 0, 0, &wm8753_out3_controls),
 SND_SOC_DAPM_PGA("Out 3", WM8753_PWR3, 4, 0, NULL, 0),
 SND_SOC_DAPM_OUTPUT("OUT3"),
@@ -1479,18 +1478,20 @@ static int wm8753_probe(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct snd_soc_codec_driver soc_codec_dev_wm8753 = {
+static const struct snd_soc_codec_driver soc_codec_dev_wm8753 = {
        .probe =        wm8753_probe,
        .resume =       wm8753_resume,
        .set_bias_level = wm8753_set_bias_level,
        .suspend_bias_off = true,
 
-       .controls = wm8753_snd_controls,
-       .num_controls = ARRAY_SIZE(wm8753_snd_controls),
-       .dapm_widgets = wm8753_dapm_widgets,
-       .num_dapm_widgets = ARRAY_SIZE(wm8753_dapm_widgets),
-       .dapm_routes = wm8753_dapm_routes,
-       .num_dapm_routes = ARRAY_SIZE(wm8753_dapm_routes),
+       .component_driver = {
+               .controls               = wm8753_snd_controls,
+               .num_controls           = ARRAY_SIZE(wm8753_snd_controls),
+               .dapm_widgets           = wm8753_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(wm8753_dapm_widgets),
+               .dapm_routes            = wm8753_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(wm8753_dapm_routes),
+       },
 };
 
 static const struct of_device_id wm8753_of_match[] = {