staging: rtl8192u: move debug files to debugfs

There are 4 debug files created under /proc/net/[Devname].
Due to this is purely for debuging as files are created read only,
move this to debugfs like other NIC drivers do instead of using procfs.
The directory structure will be like the following

  /sys/kernel/debug/r8192u_usb/wlan0/stats-rx
  /sys/kernel/debug/r8192u_usb/wlan0/stats-rx
  /sys/kernel/debug/r8192u_usb/wlan0/stats-ap
  /sys/kernel/debug/r8192u_usb/wlan0/registers

This is also to prepare for address rmmod warn issue.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Link: https://lore.kernel.org/r/20220730033335.74153-4-ztong0001@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/Makefile b/drivers/staging/rtl8192u/Makefile
index 5aef46cc90ef8129ff704552a311767720fb69d4..d32dfd89a606ad95b4cde1781a716fa0d322445b 100644 (file)
--- a/drivers/staging/rtl8192u/Makefile
+++ b/drivers/staging/rtl8192u/Makefile
@@ -8,7 +8,7 @@ ccflags-y += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO
 r8192u_usb-y := r8192U_core.o r8180_93cx6.o r8192U_wx.o                \
                  r8190_rtl8256.o r819xU_phy.o r819xU_firmware.o        \
                  r819xU_cmdpkt.o r8192U_dm.o r819xU_firmware_img.o     \
-                 r8192U_procfs.o                                       \
+                 r8192U_debugfs.o                                      \
                  ieee80211/ieee80211_crypt.o                           \
                  ieee80211/ieee80211_crypt_tkip.o                      \
                  ieee80211/ieee80211_crypt_ccmp.o                      \

diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h
index 5ac548ca8ecde454429adb7b15d02e6a10ddac08..75f312e41a9265c0ea8b5260426a2080121b8ab0 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U.h
+++ b/drivers/staging/rtl8192u/r8192U.h
@@ -1061,6 +1061,9 @@ typedef struct r8192_priv {
        struct delayed_work gpio_change_rf_wq;
        struct delayed_work initialgain_operate_wq;
        struct workqueue_struct *priv_wq;
+
+       /* debugfs */
+       struct dentry *debugfs_dir;
 } r8192_priv;
 
 /* For rtl8187B */
@@ -1117,8 +1120,9 @@ void EnableHWSecurityConfig8192(struct net_device *dev);
 void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType,
            const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent);
 
-void rtl8192_proc_module_init(void);
-void rtl8192_proc_init_one(struct net_device *dev);
-void rtl8192_proc_remove_one(struct net_device *dev);
+void rtl8192_debugfs_init_one(struct net_device *dev);
+void rtl8192_debugfs_exit_one(struct net_device *dev);
+void rtl8192_debugfs_init(void);
+void rtl8192_debugfs_exit(void);
 
 #endif

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 9e0861fdc64e3805393df58a3d9326eeac755e3d..865bc0dc7c71bd7ffcb192b5c151473297ba8db8 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -56,7 +56,6 @@ double __extendsfdf2(float a)
 #include "r8192U_dm.h"
 #include <linux/usb.h>
 #include <linux/slab.h>
-#include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 /* FIXME: check if 2.6.7 is ok */
 
@@ -4557,7 +4556,7 @@ static int rtl8192_usb_probe(struct usb_interface *intf,
                goto fail2;
 
        RT_TRACE(COMP_INIT, "dev name=======> %s\n", dev->name);
-       rtl8192_proc_init_one(dev);
+       rtl8192_debugfs_init_one(dev);
 
        RT_TRACE(COMP_INIT, "Driver probe completed\n");
        return 0;
@@ -4591,10 +4590,11 @@ static void rtl8192_usb_disconnect(struct usb_interface *intf)
        struct net_device *dev = usb_get_intfdata(intf);
        struct r8192_priv *priv = ieee80211_priv(dev);
 
-       unregister_netdev(dev);
 
        RT_TRACE(COMP_DOWN, "=============>wlan driver to be removed\n");
-       rtl8192_proc_remove_one(dev);
+       rtl8192_debugfs_exit_one(dev);
+
+       unregister_netdev(dev);
 
        rtl8192_down(dev);
        kfree(priv->pFirmware);
@@ -4615,10 +4615,11 @@ static int __init rtl8192_usb_module_init(void)
        RT_TRACE(COMP_INIT, "Initializing module");
        RT_TRACE(COMP_INIT, "Wireless extensions version %d", WIRELESS_EXT);
 
+       rtl8192_debugfs_init();
        ret = ieee80211_debug_init();
        if (ret) {
                pr_err("ieee80211_debug_init() failed %d\n", ret);
-               return ret;
+               goto debugfs_exit;
        }
 
        ret = ieee80211_crypto_init();
@@ -4645,14 +4646,12 @@ static int __init rtl8192_usb_module_init(void)
                goto crypto_ccmp_exit;
        }
 
-       rtl8192_proc_module_init();
        ret = usb_register(&rtl8192_usb_driver);
        if (ret)
-               goto rtl8192_proc_module_exit;
+               goto crypto_wep_exit;
        return ret;
 
-rtl8192_proc_module_exit:
-       remove_proc_entry(RTL819XU_MODULE_NAME, init_net.proc_net);
+crypto_wep_exit:
        ieee80211_crypto_wep_exit();
 crypto_ccmp_exit:
        ieee80211_crypto_ccmp_exit();
@@ -4662,18 +4661,20 @@ crypto_exit:
        ieee80211_crypto_deinit();
 debug_exit:
        ieee80211_debug_exit();
+debugfs_exit:
+       rtl8192_debugfs_exit();
        return ret;
 }
 
 static void __exit rtl8192_usb_module_exit(void)
 {
        usb_deregister(&rtl8192_usb_driver);
-       remove_proc_entry(RTL819XU_MODULE_NAME, init_net.proc_net);
        ieee80211_crypto_wep_exit();
        ieee80211_crypto_ccmp_exit();
        ieee80211_crypto_tkip_exit();
        ieee80211_crypto_deinit();
        ieee80211_debug_exit();
+       rtl8192_debugfs_exit();
        RT_TRACE(COMP_DOWN, "Exiting");
 }
 

diff --git a/drivers/staging/rtl8192u/r8192U_procfs.c b/drivers/staging/rtl8192u/r8192U_debugfs.c
similarity index 70%
rename from drivers/staging/rtl8192u/r8192U_procfs.c
rename to drivers/staging/rtl8192u/r8192U_debugfs.c
index d6f8401526c5860212d3ff41113c5335de830eb4..c645043466578d0a39059ac3328e021cd6d96f36 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_procfs.c
+++ b/drivers/staging/rtl8192u/r8192U_debugfs.c
@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0
 /****************************************************************************
- *   -----------------------------PROCFS STUFF-------------------------
+ *   -----------------------------DEGUGFS STUFF-------------------------
  ****************************************************************************/
-#include <linux/proc_fs.h>
+#include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include "r8192U.h"
 
-static struct proc_dir_entry *rtl8192_proc;
-static int __maybe_unused proc_get_stats_ap(struct seq_file *m, void *v)
+#define KBUILD_MODNAME "r8192u_usb"
+
+static int rtl8192_usb_stats_ap_show(struct seq_file *m, void *v)
 {
        struct net_device *dev = m->private;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -26,7 +27,7 @@ static int __maybe_unused proc_get_stats_ap(struct seq_file *m, void *v)
        return 0;
 }
 
-static int __maybe_unused proc_get_registers(struct seq_file *m, void *v)
+static int rtl8192_usb_registers_show(struct seq_file *m, void *v)
 {
        struct net_device *dev = m->private;
        int i, n, max = 0xff;
@@ -67,7 +68,7 @@ static int __maybe_unused proc_get_registers(struct seq_file *m, void *v)
        return 0;
 }
 
-static int __maybe_unused proc_get_stats_tx(struct seq_file *m, void *v)
+static int rtl8192_usb_stats_tx_show(struct seq_file *m, void *v)
 {
        struct net_device *dev = m->private;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -126,7 +127,7 @@ static int __maybe_unused proc_get_stats_tx(struct seq_file *m, void *v)
        return 0;
 }
 
-static int __maybe_unused proc_get_stats_rx(struct seq_file *m, void *v)
+static int rtl8192_usb_stats_rx_show(struct seq_file *m, void *v)
 {
        struct net_device *dev = m->private;
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -142,34 +143,38 @@ static int __maybe_unused proc_get_stats_rx(struct seq_file *m, void *v)
        return 0;
 }
 
-void rtl8192_proc_module_init(void)
+DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_stats_rx);
+DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_stats_tx);
+DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_stats_ap);
+DEFINE_SHOW_ATTRIBUTE(rtl8192_usb_registers);
+
+void rtl8192_debugfs_init_one(struct net_device *dev)
+{
+       struct r8192_priv *priv = ieee80211_priv(dev);
+       struct dentry *parent_dir = debugfs_lookup(KBUILD_MODNAME, NULL);
+       struct dentry *dir = debugfs_create_dir(dev->name, parent_dir);
+
+       debugfs_create_file("stats-rx", 0444, dir, dev, &rtl8192_usb_stats_rx_fops);
+       debugfs_create_file("stats-tx", 0444, dir, dev, &rtl8192_usb_stats_tx_fops);
+       debugfs_create_file("stats-ap", 0444, dir, dev, &rtl8192_usb_stats_ap_fops);
+       debugfs_create_file("registers", 0444, dir, dev, &rtl8192_usb_registers_fops);
+
+       priv->debugfs_dir = dir;
+}
+
+void rtl8192_debugfs_exit_one(struct net_device *dev)
 {
-       RT_TRACE(COMP_INIT, "Initializing proc filesystem");
-       rtl8192_proc = proc_mkdir(RTL819XU_MODULE_NAME, init_net.proc_net);
+       struct r8192_priv *priv = ieee80211_priv(dev);
+
+       debugfs_remove_recursive(priv->debugfs_dir);
 }
 
-void rtl8192_proc_init_one(struct net_device *dev)
+void rtl8192_debugfs_init(void)
 {
-       struct proc_dir_entry *dir;
-
-       if (!rtl8192_proc)
-               return;
-
-       dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
-       if (!dir)
-               return;
-
-       proc_create_single("stats-rx", S_IFREG | 0444, dir,
-                          proc_get_stats_rx);
-       proc_create_single("stats-tx", S_IFREG | 0444, dir,
-                          proc_get_stats_tx);
-       proc_create_single("stats-ap", S_IFREG | 0444, dir,
-                          proc_get_stats_ap);
-       proc_create_single("registers", S_IFREG | 0444, dir,
-                          proc_get_registers);
+       debugfs_create_dir(KBUILD_MODNAME, NULL);
 }
 
-void rtl8192_proc_remove_one(struct net_device *dev)
+void rtl8192_debugfs_exit(void)
 {
-       remove_proc_subtree(dev->name, rtl8192_proc);
+       debugfs_remove_recursive(debugfs_lookup(KBUILD_MODNAME, NULL));
 }