CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm9705.c

 /*
  * wm9705.c  --  ALSA Soc WM9705 codec support
  *
  * Copyright 2008 Ian Molton <spyro@f2s.com>
  *
  *  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; Version 2 of the  License only.
  *
  */
 
 #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 "wm9705.h"
 
 /*
  * WM9705 register cache
  */
 static const u16 wm9705_reg[] = {
         0x6150, 0x8000, 0x8000, 0x8000, /* 0x0  */
         0x0000, 0x8000, 0x8008, 0x8008, /* 0x8  */
         0x8808, 0x8808, 0x8808, 0x8808, /* 0x10 */
@@ skipping 163 matching lines @@
         {"ADC PGA", NULL, "Left Capture Source"},
         {"ADC PGA", NULL, "Right Capture Source"},
 
         /* ADC's */
         {"Left ADC",  NULL, "ADC PGA"},
         {"Right ADC", NULL, "ADC PGA"},
 };
 
 static int wm9705_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm9705_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm9705_dapm_widgets,
                                         ARRAY_SIZE(wm9705_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;
 }
 
 /* We use a register cache to enhance read performance. */
 static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg)
 {
         u16 *cache = codec->reg_cache;
 
         switch (reg) {
@@ skipping 202 matching lines @@
 
 static void __exit wm9705_exit(void)
 {
         platform_driver_unregister(&wm9705_codec_driver);
 }
 module_exit(wm9705_exit);
 
 MODULE_DESCRIPTION("ASoC WM9705 driver");
 MODULE_AUTHOR("Ian Molton");
 MODULE_LICENSE("GPL v2");