Merge remote-tracking branch 'asoc/topic/dma' into asoc-next

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge

diff --cc sound/soc/fsl/imx-ssi.c
Simple merge

diff --cc sound/soc/mxs/mxs-saif.c
Simple merge

diff --cc sound/soc/soc-core.c
index 7bf21a1035ea4ff5d5b970d58784db52191150c6,78468c64dd86d7287d2c053e615e5a8433668cd9..d56bbea6e75e60158405f45b1cf280f4d0fb9ac1
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -3898,23 -3900,17 +3898,16 @@@ static void snd_soc_unregister_dais(str
        for (i = 0; i < count; i++)
                snd_soc_unregister_dai(dev);
  }
 -EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
  
  /**
-  * snd_soc_register_platform - Register a platform with the ASoC core
-  *
-  * @platform: platform to register
+  * snd_soc_add_platform - Add a platform to the ASoC core
+  * @dev: The parent device for the platform
+  * @platform: The platform to add
+  * @platform_driver: The driver for the platform
   */
- int snd_soc_register_platform(struct device *dev,
+ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
                const struct snd_soc_platform_driver *platform_drv)
  {
-       struct snd_soc_platform *platform;
- 
-       dev_dbg(dev, "ASoC: platform register %s\n", dev_name(dev));
- 
-       platform = kzalloc(sizeof(struct snd_soc_platform), GFP_KERNEL);
-       if (platform == NULL)
-               return -ENOMEM;
- 
        /* create platform component name */
        platform->name = fmt_single_name(dev, &platform->id);
        if (platform->name == NULL) {

diff --cc sound/soc/spear/spear_pcm.c
Simple merge