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/b43 | |
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/b43')
-rw-r--r-- | drivers/net/wireless/b43/debugfs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c index e751fdee89b2..e807bd930647 100644 --- a/drivers/net/wireless/b43/debugfs.c +++ b/drivers/net/wireless/b43/debugfs.c | |||
@@ -500,12 +500,6 @@ out: | |||
500 | 500 | ||
501 | #undef fappend | 501 | #undef fappend |
502 | 502 | ||
503 | static int b43_debugfs_open(struct inode *inode, struct file *file) | ||
504 | { | ||
505 | file->private_data = inode->i_private; | ||
506 | return 0; | ||
507 | } | ||
508 | |||
509 | static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf, | 503 | static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf, |
510 | size_t count, loff_t *ppos) | 504 | size_t count, loff_t *ppos) |
511 | { | 505 | { |
@@ -624,7 +618,7 @@ out_unlock: | |||
624 | .read = _read, \ | 618 | .read = _read, \ |
625 | .write = _write, \ | 619 | .write = _write, \ |
626 | .fops = { \ | 620 | .fops = { \ |
627 | .open = b43_debugfs_open, \ | 621 | .open = simple_open, \ |
628 | .read = b43_debugfs_read, \ | 622 | .read = b43_debugfs_read, \ |
629 | .write = b43_debugfs_write, \ | 623 | .write = b43_debugfs_write, \ |
630 | .llseek = generic_file_llseek, \ | 624 | .llseek = generic_file_llseek, \ |