CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm2000.c

 /*
  * wm2000.c  --  WM2000 ALSA Soc Audio driver
  *
  * Copyright 2008-2010 Wolfson Microelectronics PLC.
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ skipping 18 matching lines @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
 #include <sound/wm2000.h>
 
 #include "wm2000.h"
 
 enum wm2000_anc_mode {
         ANC_ACTIVE = 0,
         ANC_BYPASS = 1,
@@ skipping 648 matching lines @@
 static const struct snd_soc_dapm_route audio_map[] = {
         { "WM2000 SPKN", NULL, "ANC Engine" },
         { "WM2000 SPKP", NULL, "ANC Engine" },
         { "ANC Engine", NULL, "WM2000 LINN" },
         { "ANC Engine", NULL, "WM2000 LINP" },
 };
 
 /* Called from the machine driver */
 int wm2000_add_controls(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         if (!wm2000_i2c) {
                 pr_err("WM2000 not yet probed\n");
                 return -ENODEV;
         }
 
-        ret = snd_soc_dapm_new_controls(codec, wm2000_dapm_widgets,
+        ret = snd_soc_dapm_new_controls(dapm, wm2000_dapm_widgets,
                                         ARRAY_SIZE(wm2000_dapm_widgets));
         if (ret < 0)
                 return ret;
 
-        ret = snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        ret = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
         if (ret < 0)
                 return ret;
 
         return snd_soc_add_controls(codec, wm2000_controls,
                         ARRAY_SIZE(wm2000_controls));
 }
 EXPORT_SYMBOL_GPL(wm2000_add_controls);
 
 static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,
                                       const struct i2c_device_id *i2c_id)
@@ skipping 150 matching lines @@
 
 static void __exit wm2000_exit(void)
 {
         i2c_del_driver(&wm2000_i2c_driver);
 }
 module_exit(wm2000_exit);
 
 MODULE_DESCRIPTION("ASoC WM2000 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfonmicro.com>");
 MODULE_LICENSE("GPL");