From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 18 Apr 2013 14:24:31 +0000 (+0200)
Subject: Merge tag 'asoc-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: upstream/snapshot3+hdmi~5112^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8dd2b66d1a961231685a3bfe5937c85d846fbf5d;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'asoc-v3.10-2' of git://git./linux/kernel/git/broonie/sound into for-next

ASoC: More updates for v3.10

The main additional change here is Lars-Peter's DMA work plus the
platform conversions which have been tested - getting this in mainline
will make life easier for development after the merge window.  These
factor a large chunk of code out of the drivers for the platforms using
dmaengine, greatly simplifying development.
---

8dd2b66d1a961231685a3bfe5937c85d846fbf5d
diff --cc sound/soc/soc-core.c
index 7bf21a1,78468c6..d56bbea
--- 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) {