Commit 0fc811e5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

x86: kdebugfs: 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.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: <x86@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 519e96ee
...@@ -68,33 +68,18 @@ static const struct file_operations fops_setup_data = { ...@@ -68,33 +68,18 @@ static const struct file_operations fops_setup_data = {
.llseek = default_llseek, .llseek = default_llseek,
}; };
static int __init static void __init
create_setup_data_node(struct dentry *parent, int no, create_setup_data_node(struct dentry *parent, int no,
struct setup_data_node *node) struct setup_data_node *node)
{ {
struct dentry *d, *type, *data; struct dentry *d;
char buf[16]; char buf[16];
sprintf(buf, "%d", no); sprintf(buf, "%d", no);
d = debugfs_create_dir(buf, parent); d = debugfs_create_dir(buf, parent);
if (!d)
return -ENOMEM;
type = debugfs_create_x32("type", S_IRUGO, d, &node->type);
if (!type)
goto err_dir;
data = debugfs_create_file("data", S_IRUGO, d, node, &fops_setup_data);
if (!data)
goto err_type;
return 0; debugfs_create_x32("type", S_IRUGO, d, &node->type);
debugfs_create_file("data", S_IRUGO, d, node, &fops_setup_data);
err_type:
debugfs_remove(type);
err_dir:
debugfs_remove(d);
return -ENOMEM;
} }
static int __init create_setup_data_nodes(struct dentry *parent) static int __init create_setup_data_nodes(struct dentry *parent)
...@@ -107,8 +92,6 @@ static int __init create_setup_data_nodes(struct dentry *parent) ...@@ -107,8 +92,6 @@ static int __init create_setup_data_nodes(struct dentry *parent)
int no = 0; int no = 0;
d = debugfs_create_dir("setup_data", parent); d = debugfs_create_dir("setup_data", parent);
if (!d)
return -ENOMEM;
pa_data = boot_params.hdr.setup_data; pa_data = boot_params.hdr.setup_data;
...@@ -129,19 +112,17 @@ static int __init create_setup_data_nodes(struct dentry *parent) ...@@ -129,19 +112,17 @@ static int __init create_setup_data_nodes(struct dentry *parent)
node->paddr = pa_data; node->paddr = pa_data;
node->type = data->type; node->type = data->type;
node->len = data->len; node->len = data->len;
error = create_setup_data_node(d, no, node); create_setup_data_node(d, no, node);
pa_data = data->next; pa_data = data->next;
memunmap(data); memunmap(data);
if (error)
goto err_dir;
no++; no++;
} }
return 0; return 0;
err_dir: err_dir:
debugfs_remove(d); debugfs_remove_recursive(d);
return error; return error;
} }
...@@ -152,35 +133,18 @@ static struct debugfs_blob_wrapper boot_params_blob = { ...@@ -152,35 +133,18 @@ static struct debugfs_blob_wrapper boot_params_blob = {
static int __init boot_params_kdebugfs_init(void) static int __init boot_params_kdebugfs_init(void)
{ {
struct dentry *dbp, *version, *data; struct dentry *dbp;
int error = -ENOMEM; int error;
dbp = debugfs_create_dir("boot_params", arch_debugfs_dir); dbp = debugfs_create_dir("boot_params", arch_debugfs_dir);
if (!dbp)
return -ENOMEM;
version = debugfs_create_x16("version", S_IRUGO, dbp,
&boot_params.hdr.version);
if (!version)
goto err_dir;
data = debugfs_create_blob("data", S_IRUGO, dbp, debugfs_create_x16("version", S_IRUGO, dbp, &boot_params.hdr.version);
&boot_params_blob); debugfs_create_blob("data", S_IRUGO, dbp, &boot_params_blob);
if (!data)
goto err_version;
error = create_setup_data_nodes(dbp); error = create_setup_data_nodes(dbp);
if (error) if (error)
goto err_data; debugfs_remove_recursive(dbp);
return 0;
err_data:
debugfs_remove(data);
err_version:
debugfs_remove(version);
err_dir:
debugfs_remove(dbp);
return error; return error;
} }
#endif /* CONFIG_DEBUG_BOOT_PARAMS */ #endif /* CONFIG_DEBUG_BOOT_PARAMS */
...@@ -190,8 +154,6 @@ static int __init arch_kdebugfs_init(void) ...@@ -190,8 +154,6 @@ static int __init arch_kdebugfs_init(void)
int error = 0; int error = 0;
arch_debugfs_dir = debugfs_create_dir("x86", NULL); arch_debugfs_dir = debugfs_create_dir("x86", NULL);
if (!arch_debugfs_dir)
return -ENOMEM;
#ifdef CONFIG_DEBUG_BOOT_PARAMS #ifdef CONFIG_DEBUG_BOOT_PARAMS
error = boot_params_kdebugfs_init(); error = boot_params_kdebugfs_init();
......
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