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/gpu | |
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/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index fdb7ccefffbd..b505b70dba05 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
@@ -1502,14 +1502,6 @@ static int i915_ppgtt_info(struct seq_file *m, void *data) | |||
1502 | return 0; | 1502 | return 0; |
1503 | } | 1503 | } |
1504 | 1504 | ||
1505 | static int | ||
1506 | i915_debugfs_common_open(struct inode *inode, | ||
1507 | struct file *filp) | ||
1508 | { | ||
1509 | filp->private_data = inode->i_private; | ||
1510 | return 0; | ||
1511 | } | ||
1512 | |||
1513 | static ssize_t | 1505 | static ssize_t |
1514 | i915_wedged_read(struct file *filp, | 1506 | i915_wedged_read(struct file *filp, |
1515 | char __user *ubuf, | 1507 | char __user *ubuf, |
@@ -1560,7 +1552,7 @@ i915_wedged_write(struct file *filp, | |||
1560 | 1552 | ||
1561 | static const struct file_operations i915_wedged_fops = { | 1553 | static const struct file_operations i915_wedged_fops = { |
1562 | .owner = THIS_MODULE, | 1554 | .owner = THIS_MODULE, |
1563 | .open = i915_debugfs_common_open, | 1555 | .open = simple_open, |
1564 | .read = i915_wedged_read, | 1556 | .read = i915_wedged_read, |
1565 | .write = i915_wedged_write, | 1557 | .write = i915_wedged_write, |
1566 | .llseek = default_llseek, | 1558 | .llseek = default_llseek, |
@@ -1622,7 +1614,7 @@ i915_max_freq_write(struct file *filp, | |||
1622 | 1614 | ||
1623 | static const struct file_operations i915_max_freq_fops = { | 1615 | static const struct file_operations i915_max_freq_fops = { |
1624 | .owner = THIS_MODULE, | 1616 | .owner = THIS_MODULE, |
1625 | .open = i915_debugfs_common_open, | 1617 | .open = simple_open, |
1626 | .read = i915_max_freq_read, | 1618 | .read = i915_max_freq_read, |
1627 | .write = i915_max_freq_write, | 1619 | .write = i915_max_freq_write, |
1628 | .llseek = default_llseek, | 1620 | .llseek = default_llseek, |
@@ -1693,7 +1685,7 @@ i915_cache_sharing_write(struct file *filp, | |||
1693 | 1685 | ||
1694 | static const struct file_operations i915_cache_sharing_fops = { | 1686 | static const struct file_operations i915_cache_sharing_fops = { |
1695 | .owner = THIS_MODULE, | 1687 | .owner = THIS_MODULE, |
1696 | .open = i915_debugfs_common_open, | 1688 | .open = simple_open, |
1697 | .read = i915_cache_sharing_read, | 1689 | .read = i915_cache_sharing_read, |
1698 | .write = i915_cache_sharing_write, | 1690 | .write = i915_cache_sharing_write, |
1699 | .llseek = default_llseek, | 1691 | .llseek = default_llseek, |