Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --combined sound/soc/codecs/wm8350.c
index 8ae2020,c342c2c..0221ca7
--- 1/sound/soc/codecs/wm8350.c
--- 2/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@@ -13,7 -13,6 +13,7 @@@
  #include <linux/module.h>
  #include <linux/moduleparam.h>
  #include <linux/init.h>
 +#include <linux/slab.h>
  #include <linux/delay.h>
  #include <linux/pm.h>
  #include <linux/platform_device.h>
@@@ -426,8 -425,8 +426,8 @@@ static const struct soc_enum wm8350_enu
        SOC_ENUM_SINGLE(WM8350_INPUT_MIXER_VOLUME, 15, 2, wm8350_lr),
  };
  
- static DECLARE_TLV_DB_LINEAR(pre_amp_tlv, -1200, 3525);
- static DECLARE_TLV_DB_LINEAR(out_pga_tlv, -5700, 600);
+ static DECLARE_TLV_DB_SCALE(pre_amp_tlv, -1200, 3525, 0);
+ static DECLARE_TLV_DB_SCALE(out_pga_tlv, -5700, 600, 0);
  static DECLARE_TLV_DB_SCALE(dac_pcm_tlv, -7163, 36, 1);
  static DECLARE_TLV_DB_SCALE(adc_pcm_tlv, -12700, 50, 1);
  static DECLARE_TLV_DB_SCALE(out_mix_tlv, -1500, 300, 1);

diff --combined sound/soc/codecs/wm8400.c
index 7f5d080,535db3b..8f29406
--- 1/sound/soc/codecs/wm8400.c
--- 2/sound/soc/codecs/wm8400.c
+++ b/sound/soc/codecs/wm8400.c
@@@ -14,7 -14,6 +14,7 @@@
  #include <linux/module.h>
  #include <linux/moduleparam.h>
  #include <linux/kernel.h>
 +#include <linux/slab.h>
  #include <linux/init.h>
  #include <linux/delay.h>
  #include <linux/pm.h>
@@@ -107,21 -106,21 +107,21 @@@ static void wm8400_codec_reset(struct s
        wm8400_reset_codec_reg_cache(wm8400->wm8400);
  }
  
- static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600);
+ static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0);
  
- static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000);
+ static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, -2100, 0);
+ static const DECLARE_TLV_DB_SCALE(out_mix_tlv, -2100, 0, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600);
+ static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0);
+ static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0);
+ static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0);
  
- static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763);
+ static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0);
+ static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);
  
  static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
          struct snd_ctl_elem_value *ucontrol)
@@@ -440,7 -439,7 +440,7 @@@ static int outmixer_event (struct snd_s
  /* INMIX dB values */
  static const unsigned int in_mix_tlv[] = {
        TLV_DB_RANGE_HEAD(1),
-       0,7, TLV_DB_LINEAR_ITEM(-1200, 600),
+       0,7, TLV_DB_SCALE_ITEM(-1200, 600, 0),
  };
  
  /* Left In PGA Connections */

diff --combined sound/soc/codecs/wm8990.c
index 7b536d9,b6c003f..c018772
--- 1/sound/soc/codecs/wm8990.c
--- 2/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@@ -18,7 -18,6 +18,7 @@@
  #include <linux/pm.h>
  #include <linux/i2c.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
@@@ -111,21 -110,21 +111,21 @@@ static const u16 wm8990_reg[] = 
  
  #define wm8990_reset(c) snd_soc_write(c, WM8990_RESET, 0)
  
- static const DECLARE_TLV_DB_LINEAR(rec_mix_tlv, -1500, 600);
+ static const DECLARE_TLV_DB_SCALE(rec_mix_tlv, -1500, 600, 0);
  
- static const DECLARE_TLV_DB_LINEAR(in_pga_tlv, -1650, 3000);
+ static const DECLARE_TLV_DB_SCALE(in_pga_tlv, -1650, 3000, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_mix_tlv, 0, -2100);
+ static const DECLARE_TLV_DB_SCALE(out_mix_tlv, 0, -2100, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_pga_tlv, -7300, 600);
+ static const DECLARE_TLV_DB_SCALE(out_pga_tlv, -7300, 600, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_omix_tlv, -600, 0);
+ static const DECLARE_TLV_DB_SCALE(out_omix_tlv, -600, 0, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_dac_tlv, -7163, 0);
+ static const DECLARE_TLV_DB_SCALE(out_dac_tlv, -7163, 0, 0);
  
- static const DECLARE_TLV_DB_LINEAR(in_adc_tlv, -7163, 1763);
+ static const DECLARE_TLV_DB_SCALE(in_adc_tlv, -7163, 1763, 0);
  
- static const DECLARE_TLV_DB_LINEAR(out_sidetone_tlv, -3600, 0);
+ static const DECLARE_TLV_DB_SCALE(out_sidetone_tlv, -3600, 0, 0);
  
  static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
@@@ -451,7 -450,7 +451,7 @@@ static int outmixer_event(struct snd_so
  /* INMIX dB values */
  static const unsigned int in_mix_tlv[] = {
        TLV_DB_RANGE_HEAD(1),
-       0, 7, TLV_DB_LINEAR_ITEM(-1200, 600),
+       0, 7, TLV_DB_SCALE_ITEM(-1200, 600, 0),
  };
  
  /* Left In PGA Connections */

diff --combined sound/soc/imx/imx-pcm-dma-mx2.c
index 2b31ac6,7bd07d6..05f19c9
--- 1/sound/soc/imx/imx-pcm-dma-mx2.c
--- 2/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@@ -19,7 -19,6 +19,7 @@@
  #include <linux/interrupt.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  
  #include <sound/core.h>
  #include <sound/initval.h>
@@@ -73,7 -72,8 +73,8 @@@ static void snd_imx_dma_err_callback(in
  {
        struct snd_pcm_substream *substream = data;
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct imx_pcm_dma_params *dma_params = rtd->dai->cpu_dai->dma_data;
+       struct imx_pcm_dma_params *dma_params = 
+               snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
        struct snd_pcm_runtime *runtime = substream->runtime;
        struct imx_pcm_runtime_data *iprtd = runtime->private_data;
        int ret;
@@@ -102,7 -102,7 +103,7 @@@ static int imx_ssi_dma_alloc(struct snd
        struct imx_pcm_runtime_data *iprtd = runtime->private_data;
        int ret;
  
-       dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);
+       dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
  
        iprtd->dma = imx_dma_request_by_prio(DRV_NAME, DMA_PRIO_HIGH);
        if (iprtd->dma < 0) {
@@@ -212,7 -212,7 +213,7 @@@ static int snd_imx_pcm_prepare(struct s
        struct imx_pcm_runtime_data *iprtd = runtime->private_data;
        int err;
  
-       dma_params = snd_soc_get_dma_data(rtd->dai->cpu_dai, substream);
+       dma_params = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
  
        iprtd->substream = substream;
        iprtd->buf = (unsigned int *)substream->dma_buffer.area;

diff --combined sound/soc/sh/siu_dai.c
index d86ee1b,c86c085..eeed5ed
--- 1/sound/soc/sh/siu_dai.c
--- 2/sound/soc/sh/siu_dai.c
+++ b/sound/soc/sh/siu_dai.c
@@@ -22,7 -22,6 +22,7 @@@
  #include <linux/delay.h>
  #include <linux/firmware.h>
  #include <linux/pm_runtime.h>
 +#include <linux/slab.h>
  
  #include <asm/clock.h>
  #include <asm/siu.h>
@@@ -588,6 -587,8 +588,8 @@@ static int siu_dai_prepare(struct snd_p
                ret = siu_dai_spbstart(port_info);
                if (ret < 0)
                        goto fail;
+       } else {
+               ret = 0;
        }
  
        port_info->play_cap |= self;