diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 11:35:37 -0600 | 
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-08 11:35:37 -0600 | 
| commit | 7b96c686223a5c902d6a59c7d178f3904f0ab757 (patch) | |
| tree | fe328ed56ad3719de3cfebad72ef74e34f1ed92b /drivers/net/wireless/ath/ath9k/dfs_debug.c | |
| parent | f141ed65f256ec036c7fba604da6b7c448096ef9 (diff) | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| download | olio-linux-3.10-7b96c686223a5c902d6a59c7d178f3904f0ab757.tar.xz olio-linux-3.10-7b96c686223a5c902d6a59c7d178f3904f0ab757.zip  | |
Merge tag 'v3.4-rc6' into gpio/next
Linux 3.4-rc6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/dfs_debug.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_debug.c | 9 | 
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/dfs_debug.c b/drivers/net/wireless/ath/ath9k/dfs_debug.c index 106d031d834..4364c103ed3 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_debug.c +++ b/drivers/net/wireless/ath/ath9k/dfs_debug.c @@ -60,16 +60,9 @@ static ssize_t read_file_dfs(struct file *file, char __user *user_buf,  	return retval;  } -static int ath9k_dfs_debugfs_open(struct inode *inode, struct file *file) -{ -	file->private_data = inode->i_private; - -	return 0; -} -  static const struct file_operations fops_dfs_stats = {  	.read = read_file_dfs, -	.open = ath9k_dfs_debugfs_open, +	.open = simple_open,  	.owner = THIS_MODULE,  	.llseek = default_llseek,  };  |