Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 234e3405 authored by Stephen Boyd's avatar Stephen Boyd Committed by Linus Torvalds
Browse files

simple_open: automatically convert to simple_open() 



Many users of debugfs copy the implementation of default_open() when
they want to support a custom read/write function op.  This leads to a
proliferation of the default_open() implementation across the entire
tree.

Now that the common implementation has been consolidated into libfs we
can replace all the users of this function with simple_open().

This replacement was done with the following semantic patch:

<smpl>
@ open @
identifier open_f != simple_open;
identifier i, f;
@@
-int open_f(struct inode *i, struct file *f)
-{
(
-if (i->i_private)
-f->private_data = i->i_private;
|
-f->private_data = i->i_private;
)
-return 0;
-}

@ has_open depends on open @
identifier fops;
identifier open.open_f;
@@
struct file_operations fops = {
...
-.open = open_f,
+.open = simple_open,
...
};
</smpl>

[akpm@linux-foundation.org: checkpatch fixes]
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9b3ae64b

arch/arm/mach-msm/smd_debug.c

+1 −7
Original line number Diff line number Diff line
@@ -203,15 +203,9 @@ static ssize_t debug_read(struct file *file, char __user *buf, 
	return simple_read_from_buffer(buf, count, ppos, debug_buffer, bsize);

}



static int debug_open(struct inode *inode, struct file *file)

{

	file->private_data = inode->i_private;

	return 0;

}



static const struct file_operations debug_ops = {

	.read = debug_read,

	.open = debug_open,

	.open = simple_open,

	.llseek = default_llseek,

};

arch/x86/kernel/kdebugfs.c

+1 −8
Original line number Diff line number Diff line
@@ -68,16 +68,9 @@ static ssize_t setup_data_read(struct file *file, char __user *user_buf, 
	return count;

}



static int setup_data_open(struct inode *inode, struct file *file)

{

	file->private_data = inode->i_private;



	return 0;

}



static const struct file_operations fops_setup_data = {

	.read		= setup_data_read,

	.open		= setup_data_open,

	.open		= simple_open,

	.llseek		= default_llseek,

};

drivers/acpi/ec_sys.c

+1 −7
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may " 


static struct dentry *acpi_ec_debugfs_dir;



static int acpi_ec_open_io(struct inode *i, struct file *f)

{

	f->private_data = i->i_private;

	return 0;

}



static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,

			       size_t count, loff_t *off)

{
@@ -95,7 +89,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf, 


static const struct file_operations acpi_ec_io_ops = {

	.owner = THIS_MODULE,

	.open  = acpi_ec_open_io,

	.open  = simple_open,

	.read  = acpi_ec_read_io,

	.write = acpi_ec_write_io,

	.llseek = default_llseek,

drivers/base/regmap/regmap-debugfs.c

+3 −9
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ static size_t regmap_calc_reg_len(int max_val, char *buf, size_t buf_size) 
	return strlen(buf);

}



static int regmap_open_file(struct inode *inode, struct file *file)

{

	file->private_data = inode->i_private;

	return 0;

}



static ssize_t regmap_name_read_file(struct file *file,

				     char __user *user_buf, size_t count,

				     loff_t *ppos)
@@ -57,7 +51,7 @@ static ssize_t regmap_name_read_file(struct file *file, 
}



static const struct file_operations regmap_name_fops = {

	.open = regmap_open_file,

	.open = simple_open,

	.read = regmap_name_read_file,

	.llseek = default_llseek,

};
@@ -174,7 +168,7 @@ static ssize_t regmap_map_write_file(struct file *file, 
#endif



static const struct file_operations regmap_map_fops = {

	.open = regmap_open_file,

	.open = simple_open,

	.read = regmap_map_read_file,

	.write = regmap_map_write_file,

	.llseek = default_llseek,
@@ -243,7 +237,7 @@ static ssize_t regmap_access_read_file(struct file *file, 
}



static const struct file_operations regmap_access_fops = {

	.open = regmap_open_file,

	.open = simple_open,

	.read = regmap_access_read_file,

	.llseek = default_llseek,

};

drivers/bluetooth/btmrvl_debugfs.c

+10 −16
Original line number Diff line number Diff line
@@ -45,12 +45,6 @@ struct btmrvl_debugfs_data { 
	struct dentry *txdnldready;

};



static int btmrvl_open_generic(struct inode *inode, struct file *file)

{

	file->private_data = inode->i_private;

	return 0;

}



static ssize_t btmrvl_hscfgcmd_write(struct file *file,

			const char __user *ubuf, size_t count, loff_t *ppos)

{
@@ -93,7 +87,7 @@ static ssize_t btmrvl_hscfgcmd_read(struct file *file, char __user *userbuf, 
static const struct file_operations btmrvl_hscfgcmd_fops = {

	.read	= btmrvl_hscfgcmd_read,

	.write	= btmrvl_hscfgcmd_write,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -134,7 +128,7 @@ static ssize_t btmrvl_psmode_read(struct file *file, char __user *userbuf, 
static const struct file_operations btmrvl_psmode_fops = {

	.read	= btmrvl_psmode_read,

	.write	= btmrvl_psmode_write,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -180,7 +174,7 @@ static ssize_t btmrvl_pscmd_read(struct file *file, char __user *userbuf, 
static const struct file_operations btmrvl_pscmd_fops = {

	.read = btmrvl_pscmd_read,

	.write = btmrvl_pscmd_write,

	.open = btmrvl_open_generic,

	.open = simple_open,

	.llseek = default_llseek,

};
@@ -221,7 +215,7 @@ static ssize_t btmrvl_gpiogap_read(struct file *file, char __user *userbuf, 
static const struct file_operations btmrvl_gpiogap_fops = {

	.read	= btmrvl_gpiogap_read,

	.write	= btmrvl_gpiogap_write,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -265,7 +259,7 @@ static ssize_t btmrvl_hscmd_read(struct file *file, char __user *userbuf, 
static const struct file_operations btmrvl_hscmd_fops = {

	.read	= btmrvl_hscmd_read,

	.write	= btmrvl_hscmd_write,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -305,7 +299,7 @@ static ssize_t btmrvl_hsmode_read(struct file *file, char __user * userbuf, 
static const struct file_operations btmrvl_hsmode_fops = {

	.read	= btmrvl_hsmode_read,

	.write	= btmrvl_hsmode_write,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -323,7 +317,7 @@ static ssize_t btmrvl_curpsmode_read(struct file *file, char __user *userbuf, 


static const struct file_operations btmrvl_curpsmode_fops = {

	.read	= btmrvl_curpsmode_read,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -341,7 +335,7 @@ static ssize_t btmrvl_psstate_read(struct file *file, char __user * userbuf, 


static const struct file_operations btmrvl_psstate_fops = {

	.read	= btmrvl_psstate_read,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -359,7 +353,7 @@ static ssize_t btmrvl_hsstate_read(struct file *file, char __user *userbuf, 


static const struct file_operations btmrvl_hsstate_fops = {

	.read	= btmrvl_hsstate_read,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};
@@ -378,7 +372,7 @@ static ssize_t btmrvl_txdnldready_read(struct file *file, char __user *userbuf, 


static const struct file_operations btmrvl_txdnldready_fops = {

	.read	= btmrvl_txdnldready_read,

	.open	= btmrvl_open_generic,

	.open	= simple_open,

	.llseek = default_llseek,

};