2 files changed, 4 insertions, 15 deletions

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index a754fc08e194..590c46e672df 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1016,7 +1016,6 @@ struct kvm_stats_debugfs_item {
         const char *name;
         int offset;
         enum kvm_stat_kind kind;
-        struct dentry *dentry;
 };
 extern struct kvm_stats_debugfs_item debugfs_entries[];
 extern struct dentry *kvm_debugfs_dir;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 9649a42ee990..be3cef12706c 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3447,10 +3447,9 @@ static int kvm_init_debug(void)
                 goto out;
 
         for (p = debugfs_entries; p->name; ++p) {
-                p->dentry = debugfs_create_file(p->name, 0444, kvm_debugfs_dir,
-                                                (void *)(long)p->offset,
-                                                stat_fops[p->kind]);
-                if (p->dentry == NULL)
+                if (!debugfs_create_file(p->name, 0444, kvm_debugfs_dir,
+                                         (void *)(long)p->offset,
+                                         stat_fops[p->kind]))
                         goto out_dir;
         }
 
@@ -3462,15 +3461,6 @@ out:
         return r;
 }
 
-static void kvm_exit_debug(void)
-{
-        struct kvm_stats_debugfs_item *p;
-
-        for (p = debugfs_entries; p->name; ++p)
-                debugfs_remove(p->dentry);
-        debugfs_remove(kvm_debugfs_dir);
-}
-
 static int kvm_suspend(void)
 {
         if (kvm_usage_count)
@@ -3628,7 +3618,7 @@ EXPORT_SYMBOL_GPL(kvm_init);
 
 void kvm_exit(void)
 {
-        kvm_exit_debug();
+        debugfs_remove_recursive(kvm_debugfs_dir);
         misc_deregister(&kvm_dev);
         kmem_cache_destroy(kvm_vcpu_cache);
         kvm_async_pf_deinit();