hsr: use debugfs_remove_recursive() instead of debugfs_remove()

If it uses debugfs_remove_recursive() instead of debugfs_remove(),
hsr_priv() doesn't need to have "node_tbl_file" pointer variable.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/hsr/hsr_debugfs.c b/net/hsr/hsr_debugfs.c
index d5f709b940ffd058deb2870ea559dfb2f0db035a..9787ef11ca71cd7e9171d6edec63e44f5b172f37 100644 (file)
--- a/net/hsr/hsr_debugfs.c
+++ b/net/hsr/hsr_debugfs.c
@@ -113,7 +113,6 @@ void hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev)
                priv->node_tbl_root = NULL;
                return;
        }
-       priv->node_tbl_file = de;
 }
 
 /* hsr_debugfs_term - Tear down debugfs intrastructure
@@ -125,9 +124,7 @@ void hsr_debugfs_init(struct hsr_priv *priv, struct net_device *hsr_dev)
 void
 hsr_debugfs_term(struct hsr_priv *priv)
 {
-       debugfs_remove(priv->node_tbl_file);
-       priv->node_tbl_file = NULL;
-       debugfs_remove(priv->node_tbl_root);
+       debugfs_remove_recursive(priv->node_tbl_root);
        priv->node_tbl_root = NULL;
 }
 

diff --git a/net/hsr/hsr_main.h b/net/hsr/hsr_main.h
index 754d84b217f048fe0b61c4a8b986340b7ce3c398..7321cf8d6d2cedcf14551a9ac427c4976566a5ff 100644 (file)
--- a/net/hsr/hsr_main.h
+++ b/net/hsr/hsr_main.h
@@ -166,7 +166,6 @@ struct hsr_priv {
        unsigned char           sup_multicast_addr[ETH_ALEN];
 #ifdef CONFIG_DEBUG_FS
        struct dentry *node_tbl_root;
-       struct dentry *node_tbl_file;
 #endif
 };