CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/ep93xx/snappercl15.c

 /*
  * snappercl15.c -- SoC audio for Bluewater Systems Snapper CL15 module
  *
  * Copyright (C) 2008 Bluewater Systems Ltd
  * Author: Ryan Mallon <ryan@bluewatersys.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;  either version 2 of the  License, or (at your
  *  option) any later version.
  *
  */
 
 #include <linux/platform_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 
 #include "../codecs/tlv320aic23.h"
 #include "ep93xx-pcm.h"
 
 #define CODEC_CLOCK 5644800
 
 static int snappercl15_hw_params(struct snd_pcm_substream *substream,
@@ skipping 43 matching lines @@
 
         {"LLINEIN", NULL, "Line In"},
         {"RLINEIN", NULL, "Line In"},
 
         {"MICIN", NULL, "Mic Jack"},
 };
 
 static int snappercl15_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
                                   ARRAY_SIZE(tlv320aic23_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 struct snd_soc_dai_link snappercl15_dai = {
         .name           = "tlv320aic23",
         .stream_name    = "AIC23",
         .cpu_dai_name   = "ep93xx-i2s",
         .codec_dai_name = "tlv320aic23-hifi",
         .codec_name     = "tlv320aic23-codec.0-001a",
         .platform_name  =  "ep93xx-pcm-audio",
@@ skipping 40 matching lines @@
         ep93xx_i2s_release();
 }
 
 module_init(snappercl15_init);
 module_exit(snappercl15_exit);
 
 MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>");
 MODULE_DESCRIPTION("ALSA SoC Snapper CL15");
 MODULE_LICENSE("GPL");