Merge tag 'trace-fixes-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / net / wireless / debugfs.c

diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c
index 39765bcfb472c7299d0bb45dd0c6dc1627fc283c..920cabe0461b30cd7c5ef9d59e0f010a3bfa4297 100644 (file)
--- a/net/wireless/debugfs.c
+++ b/net/wireless/debugfs.c
@@ -13,12 +13,6 @@
 #include "core.h"
 #include "debugfs.h"
 
-static int cfg80211_open_file_generic(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
-
 #define DEBUGFS_READONLY_FILE(name, buflen, fmt, value...)             \
 static ssize_t name## _read(struct file *file, char __user *userbuf,   \
                            size_t count, loff_t *ppos)                 \
@@ -33,7 +27,7 @@ static ssize_t name## _read(struct file *file, char __user *userbuf,  \
                                                                        \
 static const struct file_operations name## _ops = {                    \
        .read = name## _read,                                           \
-       .open = cfg80211_open_file_generic,                             \
+       .open = simple_open,                                            \
        .llseek = generic_file_llseek,                                  \
 };
 
@@ -102,7 +96,7 @@ static ssize_t ht40allow_map_read(struct file *file,
 
 static const struct file_operations ht40allow_map_ops = {
        .read = ht40allow_map_read,
-       .open = cfg80211_open_file_generic,
+       .open = simple_open,
        .llseek = default_llseek,
 };