Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[muen/linux.git] / drivers / staging / rtl8192u / r8192U_core.c

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 532a71364b346eaa36386fde861f9b1d2f8b00f1..a4df95cc7f607bccb56a54218156ea816e00bfbb 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -646,64 +646,25 @@ static void rtl8192_proc_module_init(void)
        rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
 }
 
        rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
 }
 

-/*
- * seq_file wrappers for procfile show routines.
- */
-static int rtl8192_proc_open(struct inode *inode, struct file *file)
-{
-       struct net_device *dev = proc_get_parent_data(inode);
-       int (*show)(struct seq_file *, void *) = PDE_DATA(inode);
-
-       return single_open(file, show, dev);
-}
-
-static const struct file_operations rtl8192_proc_fops = {
-       .open           = rtl8192_proc_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
-/*
- * Table of proc files we need to create.
- */
-struct rtl8192_proc_file {
-       char name[12];
-       int (*show)(struct seq_file *, void *);
-};
-
-static const struct rtl8192_proc_file rtl8192_proc_files[] = {
-       { "stats-rx",   &proc_get_stats_rx },
-       { "stats-tx",   &proc_get_stats_tx },
-       { "stats-ap",   &proc_get_stats_ap },
-       { "registers",  &proc_get_registers },
-       { "" }
-};
-

 static void rtl8192_proc_init_one(struct net_device *dev)
 {
 static void rtl8192_proc_init_one(struct net_device *dev)
 {

-       const struct rtl8192_proc_file *f;

        struct proc_dir_entry *dir;
 
        struct proc_dir_entry *dir;
 

-       if (rtl8192_proc) {
-               dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
-               if (!dir) {
-                       RT_TRACE(COMP_ERR,
-                                "Unable to initialize /proc/net/rtl8192/%s\n",
-                                dev->name);
-                       return;
-               }
+       if (!rtl8192_proc)
+               return;

 
 

-               for (f = rtl8192_proc_files; f->name[0]; f++) {
-                       if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
-                                             &rtl8192_proc_fops, f->show)) {
-                               RT_TRACE(COMP_ERR,
-                                        "Unable to initialize /proc/net/rtl8192/%s/%s\n",
-                                        dev->name, f->name);
-                               return;
-                       }
-               }
-       }
+       dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
+       if (!dir)
+               return;
+
+       proc_create_single("stats-rx", S_IFREG | S_IRUGO, dir,
+                       proc_get_stats_rx);
+       proc_create_single("stats-tx", S_IFREG | S_IRUGO, dir,
+                       proc_get_stats_tx);
+       proc_create_single("stats-ap", S_IFREG | S_IRUGO, dir,
+                       proc_get_stats_ap);
+       proc_create_single("registers", S_IFREG | S_IRUGO, dir,
+                       proc_get_registers);

 }
 
 static void rtl8192_proc_remove_one(struct net_device *dev)
 }
 
 static void rtl8192_proc_remove_one(struct net_device *dev)