Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc87e0ff authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: default avatarGreg 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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c4558a26

drivers/staging/rtl8192u/r8192U.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8192u/r8192U_core.c

+6 −12
Original line number Diff line number Diff line
@@ -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;

	}

}



/****************************************************************************