rtl8187se: Use a dir under /proc/net/r8180/

Create a dir under /proc/net/r8180/ named for the device and create that
device's files under there.  This means that there won't be a problem for
multiple devices in the system (if such is possible) and it means we don't
need to save the 'device directory' PDE any more as we can just do a proc
subtree removal.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: Maxim Mikityanskiy <maxtram95@gmail.com>
cc: YAMANE Toshiaki <yamanetoshi@gmail.com>
cc: linux-wireless@vger.kernel.org
cc: devel@driverdev.osuosl.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h
index 70ea4145b4c846be5e70188de6a9af66cdf8fad0..edacc8001640b5f3494c4b727eb965debeeba2dd 100644 (file)
--- a/drivers/staging/rtl8187se/r8180.h
+++ b/drivers/staging/rtl8187se/r8180.h
@@ -372,7 +372,6 @@ typedef struct r8180_priv
        struct Stats stats;
        struct _link_detect_t link_detect;  //YJ,add,080828
        struct iw_statistics wstats;
-       struct proc_dir_entry *dir_dev;
 
        /*RX stuff*/
        u32 *rxring;

diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
index 448da77e2cd1d7b26129f24776f1e75f38db8e11..ab469ceae88c506154369412dc7ae6c1035102dc 100644 (file)
--- a/drivers/staging/rtl8187se/r8180_core.c
+++ b/drivers/staging/rtl8187se/r8180_core.c
@@ -288,14 +288,7 @@ void rtl8180_proc_module_remove(void)
 
 void rtl8180_proc_remove_one(struct net_device *dev)
 {
-       struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
-       if (priv->dir_dev) {
-               remove_proc_entry("stats-hw", priv->dir_dev);
-               remove_proc_entry("stats-tx", priv->dir_dev);
-               remove_proc_entry("stats-rx", priv->dir_dev);
-               remove_proc_entry("registers", priv->dir_dev);
-               priv->dir_dev = NULL;
-       }
+       remove_proc_subtree(dev->name, rtl8180_proc);
 }
 
 /*
@@ -335,22 +328,19 @@ static const struct rtl8180_proc_file rtl8180_proc_files[] = {
 void rtl8180_proc_init_one(struct net_device *dev)
 {
        const struct rtl8180_proc_file *f;
-       struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+       struct proc_dir_entry *dir;
 
-       priv->dir_dev = rtl8180_proc;
-       if (!priv->dir_dev) {
-               DMESGE("Unable to initialize /proc/net/r8180/%s\n",
-                     dev->name);
+       dir = proc_mkdir_data(dev->name, 0, rtl8180_proc, dev);
+       if (!dir) {
+               DMESGE("Unable to initialize /proc/net/r8180/%s\n", dev->name);
                return;
        }
-       priv->dir_dev->data = dev;
 
        for (f = rtl8180_proc_files; f->name[0]; f++) {
-               if (!proc_create_data(f->name, S_IFREG | S_IRUGO,
-                                     priv->dir_dev,
+               if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
                                      &rtl8180_proc_fops, f->show)) {
-                       DMESGE("Unable to initialize /proc/net/r8180/%s\n",
-                              f->name);
+                       DMESGE("Unable to initialize /proc/net/r8180/%s/%s\n",
+                              dev->name, f->name);
                        return;
                }
        }