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

Conflicts:
	sound/soc/soc-core.c

diff --cc sound/soc/soc-core.c
index 19c1e9588e05704aa059b8e737e4e28216a63d03,91120b8e283e03384dc70ee466cb04c795365354..72d4a2b009faaa3119582097ead72990469b5bbc
--- 1/sound/soc/soc-core.c
--- 2/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");