diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2012-04-05 17:25:11 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-05 18:25:50 -0400 |
commit | 234e340582901211f40d8c732afc49f0630ecf05 (patch) | |
tree | 753076500dfd883b3db56d4f5410af31d8945623 /drivers/net/wireless/libertas | |
parent | 9b3ae64be658a573b33d05a8dc73b08d3345fa44 (diff) |
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: Stephen 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: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index c192671610fc..a06cc283e23d 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c | |||
@@ -21,12 +21,6 @@ static char *szStates[] = { | |||
21 | static void lbs_debug_init(struct lbs_private *priv); | 21 | static void lbs_debug_init(struct lbs_private *priv); |
22 | #endif | 22 | #endif |
23 | 23 | ||
24 | static int open_file_generic(struct inode *inode, struct file *file) | ||
25 | { | ||
26 | file->private_data = inode->i_private; | ||
27 | return 0; | ||
28 | } | ||
29 | |||
30 | static ssize_t write_file_dummy(struct file *file, const char __user *buf, | 24 | static ssize_t write_file_dummy(struct file *file, const char __user *buf, |
31 | size_t count, loff_t *ppos) | 25 | size_t count, loff_t *ppos) |
32 | { | 26 | { |
@@ -696,7 +690,7 @@ out_unlock: | |||
696 | 690 | ||
697 | #define FOPS(fread, fwrite) { \ | 691 | #define FOPS(fread, fwrite) { \ |
698 | .owner = THIS_MODULE, \ | 692 | .owner = THIS_MODULE, \ |
699 | .open = open_file_generic, \ | 693 | .open = simple_open, \ |
700 | .read = (fread), \ | 694 | .read = (fread), \ |
701 | .write = (fwrite), \ | 695 | .write = (fwrite), \ |
702 | .llseek = generic_file_llseek, \ | 696 | .llseek = generic_file_llseek, \ |
@@ -962,7 +956,7 @@ static ssize_t lbs_debugfs_write(struct file *f, const char __user *buf, | |||
962 | 956 | ||
963 | static const struct file_operations lbs_debug_fops = { | 957 | static const struct file_operations lbs_debug_fops = { |
964 | .owner = THIS_MODULE, | 958 | .owner = THIS_MODULE, |
965 | .open = open_file_generic, | 959 | .open = simple_open, |
966 | .write = lbs_debugfs_write, | 960 | .write = lbs_debugfs_write, |
967 | .read = lbs_debugfs_read, | 961 | .read = lbs_debugfs_read, |
968 | .llseek = default_llseek, | 962 | .llseek = default_llseek, |