Commit 2435628e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

b43legacy: don't save dentries for debugfs 



There is no need to keep around the dentry pointers for the debugfs
files as they will all be automatically removed when the subdir is
removed.  So save the space and logic involved in keeping them around by
just getting rid of them entirely.

By doing this change, we remove one of the last in-kernel user that was
storing the result of debugfs_create_bool(), so that api can be cleaned
up.

Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: linux-wireless@vger.kernel.org
Cc: b43-dev@lists.infradead.org
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210518163309.3702100-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2100c9b0

drivers/net/wireless/broadcom/b43legacy/debugfs.c

+5 −24
Original line number Diff line number Diff line
@@ -336,22 +336,12 @@ int b43legacy_debug(struct b43legacy_wldev *dev, enum b43legacy_dyndbg feature) 
	return !!(dev->dfsentry && dev->dfsentry->dyn_debug[feature]);

}



static void b43legacy_remove_dynamic_debug(struct b43legacy_wldev *dev)

{

	struct b43legacy_dfsentry *e = dev->dfsentry;

	int i;



	for (i = 0; i < __B43legacy_NR_DYNDBG; i++)

		debugfs_remove(e->dyn_debug_dentries[i]);

}



static void b43legacy_add_dynamic_debug(struct b43legacy_wldev *dev)

{

	struct b43legacy_dfsentry *e = dev->dfsentry;



#define add_dyn_dbg(name, id, initstate) do {			\

	e->dyn_debug[id] = (initstate);				\

	e->dyn_debug_dentries[id] =				\

	debugfs_create_bool(name, 0600, e->subdir,		\

			    &(e->dyn_debug[id]));		\

	} while (0)
@@ -396,11 +386,9 @@ void b43legacy_debugfs_add_device(struct b43legacy_wldev *dev) 


#define ADD_FILE(name, mode)	\

	do {							\

		e->file_##name.dentry =				\

			debugfs_create_file(__stringify(name),	\

					mode, e->subdir, dev,	\

		debugfs_create_file(__stringify(name), mode,	\

				    e->subdir, dev,		\

				    &fops_##name.fops);		\

		e->file_##name.dentry = NULL;			\

	} while (0)
@@ -424,13 +412,6 @@ void b43legacy_debugfs_remove_device(struct b43legacy_wldev *dev) 
	e = dev->dfsentry;

	if (!e)

		return;

	b43legacy_remove_dynamic_debug(dev);



	debugfs_remove(e->file_tsf.dentry);

	debugfs_remove(e->file_ucode_regs.dentry);

	debugfs_remove(e->file_shm.dentry);

	debugfs_remove(e->file_txstat.dentry);

	debugfs_remove(e->file_restart.dentry);



	debugfs_remove(e->subdir);

	kfree(e->txstatlog.log);

drivers/net/wireless/broadcom/b43legacy/debugfs.h

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct b43legacy_txstatus_log { 
};



struct b43legacy_dfs_file {

	struct dentry *dentry;

	char *buffer;

	size_t data_len;

};
@@ -49,8 +48,6 @@ struct b43legacy_dfsentry { 


	/* Enabled/Disabled list for the dynamic debugging features. */

	bool dyn_debug[__B43legacy_NR_DYNDBG];

	/* Dentries for the dynamic debugging entries. */

	struct dentry *dyn_debug_dentries[__B43legacy_NR_DYNDBG];

};



int b43legacy_debug(struct b43legacy_wldev *dev,