ASoC: soc-core: Remove unneeded dentry member from snd_soc_codec
PATCH v2 1/2 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.
---
Changes since v1:
- None
include/sound/soc.h | 4 ---- sound/soc/soc-core.c | 9 +++++---- 2 files changed, 5 insertions(+), 8 deletions(-)
include/sound/soc.h +0 -4
@@ -897,10 +897,6 @@ struct snd_soc_codec {/* component */ struct snd_soc_component component; - -#ifdef CONFIG_DEBUG_FS -struct dentry *debugfs_reg; -#endif };/* codec driver */
sound/soc/soc-core.c +5 -4
@@ -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" ); }
Signature · 1 line
2.7.4
PATCH v2 2/2 ASoC: soc-core: Remove unneeded error check
debugfs_create_dir() only returns an error pointer when kernel has been built without debugfs support.
Quoting Documentation/filesystems/debugfs.txt:
"A NULL return value indicates that something went
wrong. If ERR_PTR(-ENODEV) is returned, that is an indication that the kernel has been built without debugfs support and none of the functions described below will work."
As snd_soc_debugfs_init() is only defined when CONFIG_DEBUG_FS=y, there is no possibility for debugfs_create_dir() returning an error, so remove the unneeded error check.
---
Changes since v1:
- Remove uneeded 'snd_soc_debugfs_root = NULL;' assignment
sound/soc/soc-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
sound/soc/soc-core.c +1 -2
@@ -495,9 +495,8 @@ static void soc_cleanup_card_debugfs(struct snd_soc_card *card)static void snd_soc_debugfs_init (void ) { snd_soc_debugfs_root =debugfs_create_dir ("asoc" ,NULL ); -if (IS_ERR (snd_soc_debugfs_root) || !snd_soc_debugfs_root) { +if (!snd_soc_debugfs_root) {pr_warn ("ASoC: Failed to create debugfs directory\n" ); - snd_soc_debugfs_root =NULL ;return ; }
Signature · 1 line
2.7.4
Mark Brown
maintainerRe: [PATCH v2 2/2] ASoC: soc-core: Remove unneeded error check
Quoted 8 lines · Fabio Estevam
"A NULL return value indicates that something went
wrong. IfERR_PTR(-ENODEV)is returned, that is an indication that the kernel has been built without debugfs support and none of the functions described below will work."As
snd_soc_debugfs_init()is only defined whenCONFIG_DEBUG_FS=y, there is no possibility fordebugfs_create_dir()returning an error, so remove the unneeded error check.
Removing the error handling means that if in future it does start returning errors we'll ignore them - it's not like the error handling is getting in the way or otherwise causing problems, removing it isn't making things better.