diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/net/wireless/ath/ath9k/rc.c | |
parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/rc.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/rc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 5fff711fba1..92a6c0a87f8 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c | |||
@@ -1479,12 +1479,6 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband, | |||
1479 | 1479 | ||
1480 | #ifdef CONFIG_ATH9K_DEBUGFS | 1480 | #ifdef CONFIG_ATH9K_DEBUGFS |
1481 | 1481 | ||
1482 | static int ath9k_debugfs_open(struct inode *inode, struct file *file) | ||
1483 | { | ||
1484 | file->private_data = inode->i_private; | ||
1485 | return 0; | ||
1486 | } | ||
1487 | |||
1488 | static ssize_t read_file_rcstat(struct file *file, char __user *user_buf, | 1482 | static ssize_t read_file_rcstat(struct file *file, char __user *user_buf, |
1489 | size_t count, loff_t *ppos) | 1483 | size_t count, loff_t *ppos) |
1490 | { | 1484 | { |
@@ -1552,7 +1546,7 @@ static ssize_t read_file_rcstat(struct file *file, char __user *user_buf, | |||
1552 | 1546 | ||
1553 | static const struct file_operations fops_rcstat = { | 1547 | static const struct file_operations fops_rcstat = { |
1554 | .read = read_file_rcstat, | 1548 | .read = read_file_rcstat, |
1555 | .open = ath9k_debugfs_open, | 1549 | .open = simple_open, |
1556 | .owner = THIS_MODULE | 1550 | .owner = THIS_MODULE |
1557 | }; | 1551 | }; |
1558 | 1552 | ||