x86: kdebugfs.c cleanup (390cd85c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/x86/kernel/kdebugfs.c

+36 −46

Original line number	Diff line number	Diff line
		@@ -8,11 +8,11 @@
		*/
		#include <linux/debugfs.h>
		#include <linux/uaccess.h>
		#include <linux/stat.h>
		#include <linux/module.h>
		#include <linux/init.h>
		#include <linux/stat.h>
		#include <linux/io.h>
		#include <linux/mm.h>
		#include <linux/module.h>

		#include <asm/setup.h>

		@@ -26,9 +26,8 @@ struct setup_data_node {
		u32 len;
		};

		static ssize_t
		setup_data_read(struct file file, char __user user_buf, size_t count,
		loff_t *ppos)
		static ssize_t setup_data_read(struct file file, char __user user_buf,
		size_t count, loff_t *ppos)
		{
		struct setup_data_node *node = file->private_data;
		unsigned long remain;
		@@ -39,20 +38,21 @@ setup_data_read(struct file file, char __user user_buf, size_t count,

		if (pos < 0)
		return -EINVAL;

		if (pos >= node->len)
		return 0;

		if (count > node->len - pos)
		count = node->len - pos;

		pa = node->paddr + sizeof(struct setup_data) + pos;
		pg = pfn_to_page((pa + count - 1) >> PAGE_SHIFT);
		if (PageHighMem(pg)) {
		p = ioremap_cache(pa, count);
		if (!p)
		return -ENXIO;
		} else {
		} else
		p = __va(pa);
		}

		remain = copy_to_user(user_buf, p, count);

		@@ -70,6 +70,7 @@ setup_data_read(struct file file, char __user user_buf, size_t count,
		static int setup_data_open(struct inode inode, struct file file)
		{
		file->private_data = inode->i_private;

		return 0;
		}

		@@ -84,57 +85,50 @@ create_setup_data_node(struct dentry *parent, int no,
		{
		struct dentry d, type, *data;
		char buf[16];
		int error;

		sprintf(buf, "%d", no);
		d = debugfs_create_dir(buf, parent);
		if (!d) {
		error = -ENOMEM;
		goto err_return;
		}
		if (!d)
		return -ENOMEM;

		type = debugfs_create_x32("type", S_IRUGO, d, &node->type);
		if (!type) {
		error = -ENOMEM;
		if (!type)
		goto err_dir;
		}

		data = debugfs_create_file("data", S_IRUGO, d, node, &fops_setup_data);
		if (!data) {
		error = -ENOMEM;
		if (!data)
		goto err_type;
		}

		return 0;

		err_type:
		debugfs_remove(type);
		err_dir:
		debugfs_remove(d);
		err_return:
		return error;
		return -ENOMEM;
		}

		static int __init create_setup_data_nodes(struct dentry *parent)
		{
		struct setup_data_node *node;
		struct setup_data *data;
		int error, no = 0;
		int error = -ENOMEM;
		struct dentry *d;
		struct page *pg;
		u64 pa_data;
		int no = 0;

		d = debugfs_create_dir("setup_data", parent);
		if (!d) {
		error = -ENOMEM;
		goto err_return;
		}
		if (!d)
		return -ENOMEM;

		pa_data = boot_params.hdr.setup_data;

		while (pa_data) {
		node = kmalloc(sizeof(*node), GFP_KERNEL);
		if (!node) {
		error = -ENOMEM;
		if (!node)
		goto err_dir;
		}

		pg = pfn_to_page((pa_data+sizeof(*data)-1) >> PAGE_SHIFT);
		if (PageHighMem(pg)) {
		data = ioremap_cache(pa_data, sizeof(*data));
		@@ -143,9 +137,8 @@ static int __init create_setup_data_nodes(struct dentry *parent)
		error = -ENXIO;
		goto err_dir;
		}
		} else {
		} else
		data = __va(pa_data);
		}

		node->paddr = pa_data;
		node->type = data->type;
		@@ -159,11 +152,11 @@ static int __init create_setup_data_nodes(struct dentry *parent)
		goto err_dir;
		no++;
		}

		return 0;

		err_dir:
		debugfs_remove(d);
		err_return:
		return error;
		}

		@@ -175,28 +168,26 @@ static struct debugfs_blob_wrapper boot_params_blob = {
		static int __init boot_params_kdebugfs_init(void)
		{
		struct dentry dbp, version, *data;
		int error;
		int error = -ENOMEM;

		dbp = debugfs_create_dir("boot_params", NULL);
		if (!dbp) {
		error = -ENOMEM;
		goto err_return;
		}
		if (!dbp)
		return -ENOMEM;

		version = debugfs_create_x16("version", S_IRUGO, dbp,
		&boot_params.hdr.version);
		if (!version) {
		error = -ENOMEM;
		if (!version)
		goto err_dir;
		}

		data = debugfs_create_blob("data", S_IRUGO, dbp,
		&boot_params_blob);
		if (!data) {
		error = -ENOMEM;
		if (!data)
		goto err_version;
		}

		error = create_setup_data_nodes(dbp);
		if (error)
		goto err_data;

		return 0;

		err_data:
		@@ -205,10 +196,9 @@ err_version:
		debugfs_remove(version);
		err_dir:
		debugfs_remove(dbp);
		err_return:
		return error;
		}
		#endif
		#endif /* CONFIG_DEBUG_BOOT_PARAMS */

		static int __init arch_kdebugfs_init(void)
		{