diff options
| author | David Howells <dhowells@redhat.com> | 2013-04-12 03:02:22 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-01 17:29:41 -0400 |
| commit | cc87e0fff1e639c4c7832075b8cdd89ab30d2a1f (patch) | |
| tree | ade79fe46c172a2de9c09682b8af9b6860b8726b | |
| parent | c4558a26ff661b5299942ce2b735f3cab4aed1e5 (diff) | |
rtl8192u: Don't need to save device proc dir PDE
Don't need to save the PDE of a directory created under /proc/net/rtl8192/ as
we can use proc subtree deletion to get rid of it and all its children.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: Jerry Chuang <jerry-chuang@realtek.com>
cc: linux-wireless@vger.kernel.org
cc: devel@driverdev.osuosl.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U.h | 1 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U_core.c | 18 |
2 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index e538e026b512..bedeb330ad4f 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h @@ -946,7 +946,6 @@ typedef struct r8192_priv { /*stats*/ struct Stats stats; struct iw_statistics wstats; - struct proc_dir_entry *dir_dev; /*RX stuff*/ // u32 *rxring; diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index d81d7d55f25e..27ba2a3111d2 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -669,20 +669,19 @@ static const struct rtl8192_proc_file rtl8192_proc_files[] = { void rtl8192_proc_init_one(struct net_device *dev) { const struct rtl8192_proc_file *f; - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); + struct proc_dir_entry *dir; if (rtl8192_proc) { - priv->dir_dev = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev); - if (!priv->dir_dev) { + 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; } for (f = rtl8192_proc_files; f->name[0]; f++) { - if (!proc_create_data(f->name, S_IFREG | S_IRUGO, - priv->dir_dev, - rtl8192_proc_fops, f->show)) { + 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); @@ -694,12 +693,7 @@ void rtl8192_proc_init_one(struct net_device *dev) void rtl8192_proc_remove_one(struct net_device *dev) { - struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); - - if (priv->dir_dev) { - remove_proc_subtree(dev->name, rtl8192_proc); - priv->dir_dev = NULL; - } + remove_proc_subtree(dev->name, rtl8192_proc); } /**************************************************************************** |