]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
bna: Remove field bnad_dentry_files[] in struct bnad
authorZhen Lei <thunder.leizhen@huawei.com>
Mon, 28 Oct 2024 02:09:43 +0000 (10:09 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 31 Oct 2024 01:51:52 +0000 (18:51 -0700)
Function debugfs_remove() recursively removes a directory, include all
files created by debugfs_create_file(). Therefore, there is no need to
explicitly record each file with member ->bnad_dentry_files[] and
explicitly delete them at the end. Remove field bnad_dentry_files[] and
its related processing codes for simplification.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241028020943.507-3-thunder.leizhen@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/brocade/bna/bnad.h
drivers/net/ethernet/brocade/bna/bnad_debugfs.c

index 10b1e534030e628d340128ba641f40c554b562a9..4396997c59d041fa3f3faeb0546e5fbed68a1240 100644 (file)
@@ -351,7 +351,6 @@ struct bnad {
        /* debugfs specific data */
        char    *regdata;
        u32     reglen;
-       struct dentry *bnad_dentry_files[5];
        struct dentry *port_debugfs_root;
 };
 
index 1a3a8bd133706ad49700e80fabaaf9f759b23d63..8f0972e6737c12dfa4e31dc677928a25af172b36 100644 (file)
@@ -512,12 +512,11 @@ bnad_debugfs_init(struct bnad *bnad)
 
                for (i = 0; i < ARRAY_SIZE(bnad_debugfs_files); i++) {
                        file = &bnad_debugfs_files[i];
-                       bnad->bnad_dentry_files[i] =
-                                       debugfs_create_file(file->name,
-                                                       file->mode,
-                                                       bnad->port_debugfs_root,
-                                                       bnad,
-                                                       file->fops);
+                       debugfs_create_file(file->name,
+                                           file->mode,
+                                           bnad->port_debugfs_root,
+                                           bnad,
+                                           file->fops);
                }
        }
 }
@@ -526,15 +525,6 @@ bnad_debugfs_init(struct bnad *bnad)
 void
 bnad_debugfs_uninit(struct bnad *bnad)
 {
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(bnad_debugfs_files); i++) {
-               if (bnad->bnad_dentry_files[i]) {
-                       debugfs_remove(bnad->bnad_dentry_files[i]);
-                       bnad->bnad_dentry_files[i] = NULL;
-               }
-       }
-
        /* Remove the pci_dev debugfs directory for the port */
        if (bnad->port_debugfs_root) {
                debugfs_remove(bnad->port_debugfs_root);