CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/ad1836.c

 /*
  * File:         sound/soc/codecs/ad1836.c
  * Author:       Barry Song <Barry.Song@analog.com>
  *
  * Created:      Aug 04 2009
  * Description:  Driver for AD1836 sound chip
  *
  * Modified:
  *               Copyright 2009 Analog Devices Inc.
  *
  * Bugs:         Enter bugs at http://blackfin.uclinux.org/
  *
  * 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/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
-#include <sound/soc-dapm.h>
 #include <linux/spi/spi.h>
 #include "ad1836.h"
 
 /* codec private data */
 struct ad1836_priv {
         enum snd_soc_control_type control_type;
         void *control_data;
 };
 
 /*
@@ skipping 172 matching lines @@
                 .rates = SNDRV_PCM_RATE_48000,
                 .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE |
                         SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE,
         },
         .ops = &ad1836_dai_ops,
 };
 
 static int ad1836_probe(struct snd_soc_codec *codec)
 {
         struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret = 0;
 
         codec->control_data = ad1836->control_data;
         ret = snd_soc_codec_set_cache_io(codec, 4, 12, SND_SOC_SPI);
         if (ret < 0) {
                 dev_err(codec->dev, "failed to set cache I/O: %d\n",
                                 ret);
-                kfree(ad1836);
                 return ret;
         }
 
         /* default setting for ad1836 */
         /* de-emphasis: 48kHz, power-on dac */
         snd_soc_write(codec, AD1836_DAC_CTRL1, 0x300);
         /* unmute dac channels */
         snd_soc_write(codec, AD1836_DAC_CTRL2, 0x0);
         /* high-pass filter enable, power-on adc */
         snd_soc_write(codec, AD1836_ADC_CTRL1, 0x100);
         /* unmute adc channles, adc aux mode */
         snd_soc_write(codec, AD1836_ADC_CTRL2, 0x180);
         /* left/right diff:PGA/MUX */
         snd_soc_write(codec, AD1836_ADC_CTRL3, 0x3A);
         /* volume */
         snd_soc_write(codec, AD1836_DAC_L1_VOL, 0x3FF);
         snd_soc_write(codec, AD1836_DAC_R1_VOL, 0x3FF);
         snd_soc_write(codec, AD1836_DAC_L2_VOL, 0x3FF);
         snd_soc_write(codec, AD1836_DAC_R2_VOL, 0x3FF);
         snd_soc_write(codec, AD1836_DAC_L3_VOL, 0x3FF);
         snd_soc_write(codec, AD1836_DAC_R3_VOL, 0x3FF);
 
         snd_soc_add_controls(codec, ad1836_snd_controls,
                              ARRAY_SIZE(ad1836_snd_controls));
-        snd_soc_dapm_new_controls(codec, ad1836_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, ad1836_dapm_widgets,
                                   ARRAY_SIZE(ad1836_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
+        snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));
 
         return ret;
 }
 
 /* power down chip */
 static int ad1836_remove(struct snd_soc_codec *codec)
 {
         /* reset clock control mode */
         u16 adc_ctrl2 = snd_soc_read(codec, AD1836_ADC_CTRL2);
         adc_ctrl2 &= ~AD1836_ADC_SERFMT_MASK;
@@ skipping 62 matching lines @@
 
 static void __exit ad1836_exit(void)
 {
         spi_unregister_driver(&ad1836_spi_driver);
 }
 module_exit(ad1836_exit);
 
 MODULE_DESCRIPTION("ASoC ad1836 driver");
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_LICENSE("GPL");