diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 17 | 
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index fdb7ccefffb..e6162a1681f 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -1224,6 +1224,9 @@ static int i915_emon_status(struct seq_file *m, void *unused)  	unsigned long temp, chipset, gfx;  	int ret; +	if (!IS_GEN5(dev)) +		return -ENODEV; +  	ret = mutex_lock_interruptible(&dev->struct_mutex);  	if (ret)  		return ret; @@ -1502,14 +1505,6 @@ static int i915_ppgtt_info(struct seq_file *m, void *data)  	return 0;  } -static int -i915_debugfs_common_open(struct inode *inode, -			 struct file *filp) -{ -	filp->private_data = inode->i_private; -	return 0; -} -  static ssize_t  i915_wedged_read(struct file *filp,  		 char __user *ubuf, @@ -1560,7 +1555,7 @@ i915_wedged_write(struct file *filp,  static const struct file_operations i915_wedged_fops = {  	.owner = THIS_MODULE, -	.open = i915_debugfs_common_open, +	.open = simple_open,  	.read = i915_wedged_read,  	.write = i915_wedged_write,  	.llseek = default_llseek, @@ -1622,7 +1617,7 @@ i915_max_freq_write(struct file *filp,  static const struct file_operations i915_max_freq_fops = {  	.owner = THIS_MODULE, -	.open = i915_debugfs_common_open, +	.open = simple_open,  	.read = i915_max_freq_read,  	.write = i915_max_freq_write,  	.llseek = default_llseek, @@ -1693,7 +1688,7 @@ i915_cache_sharing_write(struct file *filp,  static const struct file_operations i915_cache_sharing_fops = {  	.owner = THIS_MODULE, -	.open = i915_debugfs_common_open, +	.open = simple_open,  	.read = i915_cache_sharing_read,  	.write = i915_cache_sharing_write,  	.llseek = default_llseek,  |