hostap: proc: Use remove_proc_subtree()

Use remove_proc_subtree() rather than remove_proc_entry() to remove a
device-specific proc directory and all its children.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Jouni Malinen <j@w1.fi>
cc: Johannes Berg <johannes@sipsolutions.net>
cc: linux-wireless@vger.kernel.org
cc: devel@driverdev.osuosl.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index 89292cffa7643ede20cc9b39582668a59c2eb4c8..7491dab2c105a26d93317b98539388f59a5a663d 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -496,25 +496,7 @@ void hostap_init_proc(local_info_t *local)
 
 void hostap_remove_proc(local_info_t *local)
 {
-       if (local->proc != NULL) {
-#ifndef PRISM2_NO_STATION_MODES
-               remove_proc_entry("scan_results", local->proc);
-#endif /* PRISM2_NO_STATION_MODES */
-#ifdef PRISM2_IO_DEBUG
-               remove_proc_entry("io_debug", local->proc);
-#endif /* PRISM2_IO_DEBUG */
-               remove_proc_entry("pda", local->proc);
-               remove_proc_entry("aux_dump", local->proc);
-               remove_proc_entry("wds", local->proc);
-               remove_proc_entry("stats", local->proc);
-               remove_proc_entry("bss_list", local->proc);
-               remove_proc_entry("crypt", local->proc);
-#ifndef PRISM2_NO_PROCFS_DEBUG
-               remove_proc_entry("debug", local->proc);
-#endif /* PRISM2_NO_PROCFS_DEBUG */
-               if (hostap_proc != NULL)
-                       remove_proc_entry(local->proc->name, hostap_proc);
-       }
+       remove_proc_subtree(local->ddev->name, hostap_proc);
 }