b43: don't save dentries for debugfs

[linux-2.6-microblaze.git] / drivers / net / wireless / broadcom / b43 / debugfs.c

diff --git a/drivers/net/wireless/broadcom/b43/debugfs.c b/drivers/net/wireless/broadcom/b43/debugfs.c
index 89a25ae..efa9844 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);