b43: 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: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Chao Yu <chao@kernel.org>
Cc: Leon Romanovsky <leon@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: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210518163304.3702015-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/broadcom/b43/debugfs.c b/drivers/net/wireless/broadcom/b43/debugfs.c
index 89a25aefb327cee6125cf5c8fd1b20b6f69aa50d..efa98444e3fb0cb8d18dc68959a8583479d4cd5f 100644 (file)
--- a/drivers/net/wireless/broadcom/b43/debugfs.c
+++ b/drivers/net/wireless/broadcom/b43/debugfs.c
@@ -643,24 +643,14 @@ bool b43_debug(struct b43_wldev *dev, enum b43_dyndbg feature)
        return enabled;
 }
 
-static void b43_remove_dynamic_debug(struct b43_wldev *dev)
-{
-       struct b43_dfsentry *e = dev->dfsentry;
-       int i;
-
-       for (i = 0; i < __B43_NR_DYNDBG; i++)
-               debugfs_remove(e->dyn_debug_dentries[i]);
-}
-
 static void b43_add_dynamic_debug(struct b43_wldev *dev)
 {
        struct b43_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]));           \
+       debugfs_create_bool(name, 0600, e->subdir,              \
+                           &(e->dyn_debug[id]));               \
        } while (0)
 
        add_dyn_dbg("debug_xmitpower", B43_DBG_XMITPOWER, false);
@@ -713,10 +703,9 @@ void b43_debugfs_add_device(struct b43_wldev *dev)
 
 #define ADD_FILE(name, mode)   \
        do {                                                    \
-               e->file_##name.dentry =                         \
-                       debugfs_create_file(__stringify(name),  \
-                                       mode, e->subdir, dev,   \
-                                       &fops_##name.fops);     \
+               debugfs_create_file(__stringify(name),          \
+                               mode, e->subdir, dev,           \
+                               &fops_##name.fops);             \
        } while (0)
 
 
@@ -746,19 +735,6 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)
        e = dev->dfsentry;
        if (!e)
                return;
-       b43_remove_dynamic_debug(dev);
-
-       debugfs_remove(e->file_shm16read.dentry);
-       debugfs_remove(e->file_shm16write.dentry);
-       debugfs_remove(e->file_shm32read.dentry);
-       debugfs_remove(e->file_shm32write.dentry);
-       debugfs_remove(e->file_mmio16read.dentry);
-       debugfs_remove(e->file_mmio16write.dentry);
-       debugfs_remove(e->file_mmio32read.dentry);
-       debugfs_remove(e->file_mmio32write.dentry);
-       debugfs_remove(e->file_txstat.dentry);
-       debugfs_remove(e->file_restart.dentry);
-       debugfs_remove(e->file_loctls.dentry);
 
        debugfs_remove(e->subdir);
        kfree(e->txstatlog.log);

diff --git a/drivers/net/wireless/broadcom/b43/debugfs.h b/drivers/net/wireless/broadcom/b43/debugfs.h
index 0bf437c86c67ea214712015f968b7800063e6447..6f6b500b888140eca330360dc574280ce5d6742e 100644 (file)
--- a/drivers/net/wireless/broadcom/b43/debugfs.h
+++ b/drivers/net/wireless/broadcom/b43/debugfs.h
@@ -32,7 +32,6 @@ struct b43_txstatus_log {
 };
 
 struct b43_dfs_file {
-       struct dentry *dentry;
        char *buffer;
        size_t data_len;
 };
@@ -70,8 +69,6 @@ struct b43_dfsentry {
 
        /* Enabled/Disabled list for the dynamic debugging features. */
        bool dyn_debug[__B43_NR_DYNDBG];
-       /* Dentries for the dynamic debugging entries. */
-       struct dentry *dyn_debug_dentries[__B43_NR_DYNDBG];
 };
 
 bool b43_debug(struct b43_wldev *dev, enum b43_dyndbg feature);