Commit d8701fae authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Mark Brown

ASoC: Intel: SoC: skylake: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Also, if a debugfs call fails, userspace is notified with an error in
the log, so no need to log the error again.

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20190731131716.9764-1-gregkh@linuxfoundation.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9de98628
...@@ -164,10 +164,8 @@ void skl_debug_init_module(struct skl_debug *d, ...@@ -164,10 +164,8 @@ void skl_debug_init_module(struct skl_debug *d,
struct snd_soc_dapm_widget *w, struct snd_soc_dapm_widget *w,
struct skl_module_cfg *mconfig) struct skl_module_cfg *mconfig)
{ {
if (!debugfs_create_file(w->name, 0444, debugfs_create_file(w->name, 0444, d->modules, mconfig,
d->modules, mconfig, &mcfg_fops);
&mcfg_fops))
dev_err(d->dev, "%s: module debugfs init failed\n", w->name);
} }
static ssize_t fw_softreg_read(struct file *file, char __user *user_buf, static ssize_t fw_softreg_read(struct file *file, char __user *user_buf,
...@@ -224,34 +222,18 @@ struct skl_debug *skl_debugfs_init(struct skl_dev *skl) ...@@ -224,34 +222,18 @@ struct skl_debug *skl_debugfs_init(struct skl_dev *skl)
return NULL; return NULL;
/* create the debugfs dir with platform component's debugfs as parent */ /* create the debugfs dir with platform component's debugfs as parent */
d->fs = debugfs_create_dir("dsp", d->fs = debugfs_create_dir("dsp", skl->component->debugfs_root);
skl->component->debugfs_root);
if (IS_ERR(d->fs) || !d->fs) {
dev_err(&skl->pci->dev, "debugfs root creation failed\n");
return NULL;
}
d->skl = skl; d->skl = skl;
d->dev = &skl->pci->dev; d->dev = &skl->pci->dev;
/* now create the module dir */ /* now create the module dir */
d->modules = debugfs_create_dir("modules", d->fs); d->modules = debugfs_create_dir("modules", d->fs);
if (IS_ERR(d->modules) || !d->modules) {
dev_err(&skl->pci->dev, "modules debugfs create failed\n");
goto err;
}
if (!debugfs_create_file("fw_soft_regs_rd", 0444, d->fs, d, debugfs_create_file("fw_soft_regs_rd", 0444, d->fs, d,
&soft_regs_ctrl_fops)) { &soft_regs_ctrl_fops);
dev_err(d->dev, "fw soft regs control debugfs init failed\n");
goto err;
}
return d; return d;
err:
debugfs_remove_recursive(d->fs);
return NULL;
} }
void skl_debugfs_exit(struct skl_dev *skl) void skl_debugfs_exit(struct skl_dev *skl)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment