diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-25 15:01:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-25 15:01:43 +0200 |
| commit | f5b3fcfe96d6328cbac586d25823527a257b5995 (patch) | |
| tree | 03ce7d8f4a8868efbac7f3edab816915bfba87f6 /p08 | |
| parent | eb49b51a091d445ec2f737712b88687ed54651b8 (diff) | |
| download | patches-f5b3fcfe96d6328cbac586d25823527a257b5995.tar.gz | |
refresh for 5.3-rc1
Diffstat (limited to 'p08')
| -rw-r--r-- | p08 | 140 |
1 files changed, 0 insertions, 140 deletions
diff --git a/p08 b/p08 deleted file mode 100644 index dd18811f283d0f..00000000000000 --- a/p08 +++ /dev/null @@ -1,140 +0,0 @@ -From e82f2d8eab210dc7eb0dba2bd8e3c64ad485442b Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 30 May 2018 16:15:35 +0200 -Subject: [PATCH] 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/x86/kernel/kdebugfs.c | 60 ++++++++------------------------------------- - 1 file changed, 11 insertions(+), 49 deletions(-) - ---- a/arch/x86/kernel/kdebugfs.c -+++ b/arch/x86/kernel/kdebugfs.c -@@ -68,33 +68,18 @@ static const struct file_operations fops - .llseek = default_llseek, - }; - --static int __init -+static void __init - create_setup_data_node(struct dentry *parent, int no, - struct setup_data_node *node) - { -- struct dentry *d, *type, *data; -+ struct dentry *d; - char buf[16]; - - sprintf(buf, "%d", no); - 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; -- --err_type: -- debugfs_remove(type); --err_dir: -- debugfs_remove(d); -- return -ENOMEM; -+ debugfs_create_x32("type", S_IRUGO, d, &node->type); -+ debugfs_create_file("data", S_IRUGO, d, node, &fops_setup_data); - } - - static int __init create_setup_data_nodes(struct dentry *parent) -@@ -107,8 +92,6 @@ static int __init create_setup_data_node - int no = 0; - - d = debugfs_create_dir("setup_data", parent); -- if (!d) -- return -ENOMEM; - - pa_data = boot_params.hdr.setup_data; - -@@ -129,19 +112,17 @@ static int __init create_setup_data_node - node->paddr = pa_data; - node->type = data->type; - node->len = data->len; -- error = create_setup_data_node(d, no, node); -+ create_setup_data_node(d, no, node); - pa_data = data->next; - - memunmap(data); -- if (error) -- goto err_dir; - no++; - } - - return 0; - - err_dir: -- debugfs_remove(d); -+ debugfs_remove_recursive(d); - return error; - } - -@@ -152,35 +133,18 @@ static struct debugfs_blob_wrapper boot_ - - static int __init boot_params_kdebugfs_init(void) - { -- struct dentry *dbp, *version, *data; -- int error = -ENOMEM; -+ struct dentry *dbp; -+ int error; - - 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, -- &boot_params_blob); -- if (!data) -- goto err_version; -+ debugfs_create_x16("version", S_IRUGO, dbp, &boot_params.hdr.version); -+ debugfs_create_blob("data", S_IRUGO, dbp, &boot_params_blob); - - error = create_setup_data_nodes(dbp); - 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; - } - #endif /* CONFIG_DEBUG_BOOT_PARAMS */ -@@ -190,8 +154,6 @@ static int __init arch_kdebugfs_init(voi - int error = 0; - - arch_debugfs_dir = debugfs_create_dir("x86", NULL); -- if (!arch_debugfs_dir) -- return -ENOMEM; - - #ifdef CONFIG_DEBUG_BOOT_PARAMS - error = boot_params_kdebugfs_init(); |