CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm9712.c

 /*
  * wm9712.c  --  ALSA Soc WM9712 codec support
  *
  * Copyright 2006 Wolfson Microelectronics PLC.
  * Author: Liam Girdwood <lrg@slimlogic.co.uk>
  *
  *  This program is free software; you can redistribute  it and/or modify it
  *  under  the terms of  the GNU General  Public License as published by the
  *  Free Software Foundation;  either version 2 of the  License, or (at your
  *  option) any later version.
  */
 
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include "wm9712.h"
 
 #define WM9712_VERSION "0.4"
 
 static unsigned int ac97_read(struct snd_soc_codec *codec,
         unsigned int reg);
 static int ac97_write(struct snd_soc_codec *codec,
         unsigned int reg, unsigned int val);
 
 /*
@@ skipping 391 matching lines @@
         /* speaker Mux */
         {"Speaker Mux", "Speaker Mix", "Speaker Mixer"},
         {"Speaker Mux", "Headphone Mix", "Mono Mixer"},
         {"Speaker PGA", NULL, "Speaker Mux"},
         {"LOUT2", NULL, "Speaker PGA"},
         {"ROUT2", NULL, "Speaker PGA"},
 };
 
 static int wm9712_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm9712_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm9712_dapm_widgets,
                                   ARRAY_SIZE(wm9712_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         return 0;
 }
 
 static unsigned int ac97_read(struct snd_soc_codec *codec,
         unsigned int reg)
 {
         u16 *cache = codec->reg_cache;
 
         if (reg == AC97_RESET || reg == AC97_GPIO_STATUS ||
@@ skipping 114 matching lines @@
                 break;
         case SND_SOC_BIAS_STANDBY:
                 ac97_write(codec, AC97_POWERDOWN, 0x0000);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* disable everything including AC link */
                 ac97_write(codec, AC97_EXTENDED_MSTATUS, 0xffff);
                 ac97_write(codec, AC97_POWERDOWN, 0xffff);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 static int wm9712_reset(struct snd_soc_codec *codec, int try_warm)
 {
         if (try_warm && soc_ac97_ops.warm_reset) {
                 soc_ac97_ops.warm_reset(codec->ac97);
                 if (ac97_read(codec, 0) == wm9712_reg[0])
                         return 1;
         }
@@ skipping 126 matching lines @@
 
 static void __exit wm9712_exit(void)
 {
         platform_driver_unregister(&wm9712_codec_driver);
 }
 module_exit(wm9712_exit);
 
 MODULE_DESCRIPTION("ASoC WM9711/WM9712 driver");
 MODULE_AUTHOR("Liam Girdwood");
 MODULE_LICENSE("GPL");