CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8940.c

 /*
  * wm8940.c  --  WM8940 ALSA Soc Audio driver
  *
  * Author: Jonathan Cameron <jic23@cam.ac.uk>
  *
  * Based on wm8510.c
  *    Copyright  2006 Wolfson Microelectronics PLC.
  *    Author:  Liam Girdwood <lrg@slimlogic.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
@@ skipping 17 matching lines @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.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 "wm8940.h"
 
 struct wm8940_priv {
         unsigned int sysclk;
-        u16 reg_cache[WM8940_CACHEREGNUM];
         enum snd_soc_control_type control_type;
         void *control_data;
 };
 
 static u16 wm8940_reg_defaults[] = {
         0x8940, /* Soft Reset */
         0x0000, /* Power 1 */
         0x0000, /* Power 2 */
         0x0000, /* Power 3 */
         0x0010, /* Interface Control */
@@ skipping 227 matching lines @@
         /* Boost Mixer */
         {"Boost Mixer", "Mic PGA Switch", "Mic PGA"},
         {"Boost Mixer", "Mic Volume",  "MICP"},
         {"Boost Mixer", "Aux Volume", "Aux Input"},
 
         {"ADC", NULL, "Boost Mixer"},
 };
 
 static int wm8940_add_widgets(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
-        ret = snd_soc_dapm_new_controls(codec, wm8940_dapm_widgets,
+        ret = snd_soc_dapm_new_controls(dapm, wm8940_dapm_widgets,
                                         ARRAY_SIZE(wm8940_dapm_widgets));
         if (ret)
                 goto error_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)
                 goto error_ret;
 
 error_ret:
         return ret;
 }
 
 #define wm8940_reset(c) snd_soc_write(c, WM8940_SOFTRESET, 0);
 
 static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai,
@@ skipping 417 matching lines @@
 
         ret = snd_soc_add_controls(codec, wm8940_snd_controls,
                              ARRAY_SIZE(wm8940_snd_controls));
         if (ret)
                 return ret;
         ret = wm8940_add_widgets(codec);
         if (ret)
                 return ret;
 
         return ret;
-;
 }
 
 static int wm8940_remove(struct snd_soc_codec *codec)
 {
         wm8940_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_wm8940 = {
         .probe =        wm8940_probe,
@@ skipping 70 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8940_i2c_driver);
 #endif
 }
 module_exit(wm8940_exit);
 
 MODULE_DESCRIPTION("ASoC WM8940 driver");
 MODULE_AUTHOR("Jonathan Cameron");
 MODULE_LICENSE("GPL");