CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/tlv320aic26.c

 /*
  * Texas Instruments TLV320AIC26 low power audio CODEC
  * ALSA SoC CODEC driver
  *
  * Copyright (C) 2008 Secret Lab Technologies Ltd.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/device.h>
 #include <linux/sysfs.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 "tlv320aic26.h"
 
 MODULE_DESCRIPTION("ASoC TLV320AIC26 codec driver");
 MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
 MODULE_LICENSE("GPL");
 
 /* AIC26 driver private data */
 struct aic26 {
         struct spi_device *spi;
         struct snd_soc_codec codec;
-        u16 reg_cache[AIC26_NUM_REGS];  /* shadow registers */
         int master;
         int datfm;
         int mclk;
 
         /* Keyclick parameters */
         int keyclick_amplitude;
         int keyclick_freq;
         int keyclick_len;
 };
 
@@ skipping 303 matching lines @@
         return count;
 }
 
 static DEVICE_ATTR(keyclick, 0644, aic26_keyclick_show, aic26_keyclick_set);
 
 /* ---------------------------------------------------------------------
  * SoC CODEC portion of driver: probe and release routines
  */
 static int aic26_probe(struct snd_soc_codec *codec)
 {
-        struct aic26 *aic26 = snd_soc_codec_get_drvdata(codec);
         int ret, err, i, reg;
 
         dev_info(codec->dev, "Probing AIC26 SoC CODEC driver\n");
 
         /* Reset the codec to power on defaults */
         aic26_reg_write(codec, AIC26_REG_RESET, 0xBB00);
 
         /* Power up CODEC */
         aic26_reg_write(codec, AIC26_REG_POWER_CTRL, 0);
 
         /* Audio Control 3 (master mode, fsref rate) */
         reg = aic26_reg_read(codec, AIC26_REG_AUDIO_CTRL3);
         reg &= ~0xf800;
         reg |= 0x0800; /* set master mode */
         aic26_reg_write(codec, AIC26_REG_AUDIO_CTRL3, reg);
 
         /* Fill register cache */
-        for (i = 0; i < ARRAY_SIZE(aic26->reg_cache); i++)
+        for (i = 0; i < codec->driver->reg_cache_size; i++)
                 aic26_reg_read(codec, i);
 
         /* Register the sysfs files for debugging */
         /* Create SysFS files */
         ret = device_create_file(codec->dev, &dev_attr_keyclick);
         if (ret)
                 dev_info(codec->dev, "error creating sysfs files\n");
 
         /* register controls */
         dev_dbg(codec->dev, "Registering controls\n");
@@ skipping 63 matching lines @@
 {
         return spi_register_driver(&aic26_spi);
 }
 module_init(aic26_init);
 
 static void __exit aic26_exit(void)
 {
         spi_unregister_driver(&aic26_spi);
 }
 module_exit(aic26_exit);