From: Mark Brown <broonie@linaro.org>
Date: Sat, 28 Jun 2014 12:55:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component
X-Git-Tag: v3.17-rc1~101^2~5^2~16^2~10^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=211bcc6c3af90f3ee1f1297349d9d692e5f1c7e0;p=karo-tx-linux.git

Merge remote-tracking branch 'asoc/fix/debugfs' into asoc-component

Conflicts:
	sound/soc/soc-core.c
---

211bcc6c3af90f3ee1f1297349d9d692e5f1c7e0
diff --cc sound/soc/soc-core.c
index 19c1e9588e05,91120b8e283e..72d4a2b009fa
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -274,8 -294,8 +294,9 @@@ static void soc_init_codec_debugfs(stru
  {
  	struct dentry *debugfs_card_root = codec->card->debugfs_card_root;
  
- 	codec->debugfs_codec_root = debugfs_create_dir(codec->component.name,
- 						       debugfs_card_root);
+ 	codec->debugfs_codec_root = soc_debugfs_create_dir(debugfs_card_root,
 -						"codec:%s", codec->name);
++						"codec:%s",
++						codec->component.name);
  	if (!codec->debugfs_codec_root) {
  		dev_warn(codec->dev,
  			"ASoC: Failed to create codec debugfs directory\n");
@@@ -306,8 -326,8 +327,9 @@@ static void soc_init_platform_debugfs(s
  {
  	struct dentry *debugfs_card_root = platform->card->debugfs_card_root;
  
- 	platform->debugfs_platform_root = debugfs_create_dir(
- 		platform->component.name, debugfs_card_root);
+ 	platform->debugfs_platform_root = soc_debugfs_create_dir(debugfs_card_root,
 -						"platform:%s", platform->name);
++						"platform:%s",
++						platform->component.name);
  	if (!platform->debugfs_platform_root) {
  		dev_warn(platform->dev,
  			"ASoC: Failed to create platform debugfs directory\n");