From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 23 Apr 2013 18:26:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9eb8ae727dcb9f2530a895ee6b3496592853709d;p=openwrt%2Fstaging%2Fblogic.git

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

9eb8ae727dcb9f2530a895ee6b3496592853709d
diff --cc sound/soc/soc-core.c
index 7bf21a1035ea,78468c64dd86..d56bbea6e75e
--- a/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) {