Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 293554
b: refs/heads/master
c: 08e14e8
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Vetter committed Jan 29, 2012
1 parent 92eeb68 commit b54250c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 39965b376601314ba374b8fa3944f5957d4ff2de
refs/heads/master: 08e14e80d0229262063139a95209fa0dc354feaa
26 changes: 5 additions & 21 deletions trunk/drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1415,8 +1415,8 @@ static int i915_gen6_forcewake_count_info(struct seq_file *m, void *data)
}

static int
i915_wedged_open(struct inode *inode,
struct file *filp)
i915_debugfs_common_open(struct inode *inode,
struct file *filp)
{
filp->private_data = inode->i_private;
return 0;
Expand Down Expand Up @@ -1472,20 +1472,12 @@ i915_wedged_write(struct file *filp,

static const struct file_operations i915_wedged_fops = {
.owner = THIS_MODULE,
.open = i915_wedged_open,
.open = i915_debugfs_common_open,
.read = i915_wedged_read,
.write = i915_wedged_write,
.llseek = default_llseek,
};

static int
i915_max_freq_open(struct inode *inode,
struct file *filp)
{
filp->private_data = inode->i_private;
return 0;
}

static ssize_t
i915_max_freq_read(struct file *filp,
char __user *ubuf,
Expand Down Expand Up @@ -1542,20 +1534,12 @@ i915_max_freq_write(struct file *filp,

static const struct file_operations i915_max_freq_fops = {
.owner = THIS_MODULE,
.open = i915_max_freq_open,
.open = i915_debugfs_common_open,
.read = i915_max_freq_read,
.write = i915_max_freq_write,
.llseek = default_llseek,
};

static int
i915_cache_sharing_open(struct inode *inode,
struct file *filp)
{
filp->private_data = inode->i_private;
return 0;
}

static ssize_t
i915_cache_sharing_read(struct file *filp,
char __user *ubuf,
Expand Down Expand Up @@ -1621,7 +1605,7 @@ i915_cache_sharing_write(struct file *filp,

static const struct file_operations i915_cache_sharing_fops = {
.owner = THIS_MODULE,
.open = i915_cache_sharing_open,
.open = i915_debugfs_common_open,
.read = i915_cache_sharing_read,
.write = i915_cache_sharing_write,
.llseek = default_llseek,
Expand Down

0 comments on commit b54250c

Please sign in to comment.