From: Fabio Estevam Date: Mon, 7 Aug 2017 12:08:52 +0000 (-0300) Subject: ASoC: soc-core: Remove unneeded dentry member from snd_soc_codec X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=353c64dd19ebc99786c3578ea0444e1b5b1bb172;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git ASoC: soc-core: Remove unneeded dentry member from snd_soc_codec There is no need to have the *debugfs_reg dentry member as part of the snd_soc_codec structure as its only usage is inside soc_init_codec_debugfs(). Use a local dentry variable instead. Signed-off-by: Fabio Estevam Signed-off-by: Mark Brown --- diff --git a/include/sound/soc.h b/include/sound/soc.h index 10b71beb9f13..aad3f14966f1 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -903,10 +903,6 @@ struct snd_soc_codec { /* component */ struct snd_soc_component component; - -#ifdef CONFIG_DEBUG_FS - struct dentry *debugfs_reg; -#endif }; /* codec driver */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 921622a01944..558efdfd717d 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -339,11 +339,12 @@ static void soc_cleanup_component_debugfs(struct snd_soc_component *component) static void soc_init_codec_debugfs(struct snd_soc_component *component) { struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + struct dentry *debugfs_reg; - codec->debugfs_reg = debugfs_create_file("codec_reg", 0644, - codec->component.debugfs_root, - codec, &codec_reg_fops); - if (!codec->debugfs_reg) + debugfs_reg = debugfs_create_file("codec_reg", 0644, + codec->component.debugfs_root, + codec, &codec_reg_fops); + if (!debugfs_reg) dev_warn(codec->dev, "ASoC: Failed to create codec register debugfs file\n"); }