diff options
| author | Taehee Yoo <ap420073@gmail.com> | 2020-02-28 18:01:20 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-29 21:37:03 -0800 |
| commit | f3f2f98470b7b8ead7c364c103303c3cac8c2ff0 (patch) | |
| tree | bb4e78e69bdd735c97887ae5dd74f605ccc007dd /net/hsr | |
| parent | 892e09153fa3564fcbf9f422760b61eba48c123e (diff) | |
| download | linux-stable-f3f2f98470b7b8ead7c364c103303c3cac8c2ff0.tar.gz linux-stable-f3f2f98470b7b8ead7c364c103303c3cac8c2ff0.tar.bz2 linux-stable-f3f2f98470b7b8ead7c364c103303c3cac8c2ff0.zip | |
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>
Diffstat (limited to 'net/hsr')
| -rw-r--r-- | net/hsr/hsr_debugfs.c | 5 | ||||
| -rw-r--r-- | net/hsr/hsr_main.h | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/net/hsr/hsr_debugfs.c b/net/hsr/hsr_debugfs.c index d5f709b940ff..9787ef11ca71 100644 --- 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 754d84b217f0..7321cf8d6d2c 100644 --- 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 }; |