[PATCH] ASoC: soc-core: Fix checking return value of debugfs_create_dir

[PATCH] ASoC: soc-core: Fix checking return value of debugfs_create_dir

[Axel Lin]

We have CONFIG_DEBUG_FS guard around the place calling debugfs_create_dir,
thus debugfs_create_dir returns NULL on failure.

Also use pr_warn to print the warning.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 sound/soc/soc-core.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ae93aa8..69d17ec 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3356,11 +3356,8 @@ static int __init snd_soc_init(void)
 {
 #ifdef CONFIG_DEBUG_FS
 	snd_soc_debugfs_root = debugfs_create_dir("asoc", NULL);
-	if (IS_ERR(snd_soc_debugfs_root) || !snd_soc_debugfs_root) {
-		printk(KERN_WARNING
-		       "ASoC: Failed to create debugfs directory\n");
-		snd_soc_debugfs_root = NULL;
-	}
+	if (!snd_soc_debugfs_root)
+		pr_warn("ASoC: Failed to create debugfs directory\n");
 
 	if (!debugfs_create_file("codecs", 0444, snd_soc_debugfs_root, NULL,
 				 &codec_list_fops))
-- 
1.7.4.1

Re: [PATCH] ASoC: soc-core: Fix checking return value of debugfs_create_dir

[Mark Brown]

On Sun, Aug 14, 2011 at 11:23:13AM +0800, Axel Lin wrote:
> We have CONFIG_DEBUG_FS guard around the place calling debugfs_create_dir,
> thus debugfs_create_dir returns NULL on failure.

On the other hand the existing code doesn't actually have any problem,
the IS_ERR() won't give false positives, so the changelog isn't really
accurate and if anything we'll introduce a bug if someone cut'n'pastes
the code elsewhere.