Merge branch 'for-3.0' into for-3.1

diff --combined sound/soc/imx/imx-ssi.c
index 158a91c,61fceb0..10a8e27
--- 1/sound/soc/imx/imx-ssi.c
--- 2/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@@ -388,11 -388,10 +388,11 @@@ static int imx_pcm_preallocate_dma_buff
  
  static u64 imx_pcm_dmamask = DMA_BIT_MASK(32);
  
 -int imx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 -      struct snd_pcm *pcm)
 +int imx_pcm_new(struct snd_soc_pcm_runtime *rtd)
  {
 -
 +      struct snd_card *card = rtd->card->snd_card;
 +      struct snd_soc_dai *dai = rtd->cpu_dai;
 +      struct snd_pcm *pcm = rtd->pcm;
        int ret = 0;
  
        if (!card->dev->dma_mask)
@@@ -775,4 -774,4 +775,4 @@@ module_exit(imx_ssi_exit)
  MODULE_AUTHOR("Sascha Hauer, <s.hauer@pengutronix.de>");
  MODULE_DESCRIPTION("i.MX I2S/ac97 SoC Interface");
  MODULE_LICENSE("GPL");
- 
+ MODULE_ALIAS("platform:imx-ssi");

diff --combined sound/soc/pxa/pxa2xx-pcm.c
index d73d6f6,fab20a5..da28394
--- 1/sound/soc/pxa/pxa2xx-pcm.c
--- 2/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@@ -85,11 -85,9 +85,11 @@@ static struct snd_pcm_ops pxa2xx_pcm_op
  
  static u64 pxa2xx_pcm_dmamask = DMA_BIT_MASK(32);
  
 -static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
 -      struct snd_pcm *pcm)
 +static int pxa2xx_soc_pcm_new(struct snd_soc_pcm_runtime *rtd)
  {
 +      struct snd_card *card = rtd->card->snd_card;
 +      struct snd_soc_dai *dai = rtd->cpu_dai;
 +      struct snd_pcm *pcm = rtd->pcm;
        int ret = 0;
  
        if (!card->dev->dma_mask)
@@@ -97,14 -95,14 +97,14 @@@
        if (!card->dev->coherent_dma_mask)
                card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
  
-       if (dai->driver->playback.channels_min) {
+       if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
                ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,
                        SNDRV_PCM_STREAM_PLAYBACK);
                if (ret)
                        goto out;
        }
  
-       if (dai->driver->capture.channels_min) {
+       if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
                ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,
                        SNDRV_PCM_STREAM_CAPTURE);
                if (ret)