1 files changed, 13 insertions, 33 deletions

diff --git a/arch/x86/kvm/debugfs.c b/arch/x86/kvm/debugfs.c
index 329361b69d5e..018aebce33ff 100644
--- a/arch/x86/kvm/debugfs.c
+++ b/arch/x86/kvm/debugfs.c
@@ -8,11 +8,6 @@
 #include <linux/debugfs.h>
 #include "lapic.h"
 
-bool kvm_arch_has_vcpu_debugfs(void)
-{
-        return true;
-}
-
 static int vcpu_get_timer_advance_ns(void *data, u64 *val)
 {
         struct kvm_vcpu *vcpu = (struct kvm_vcpu *) data;
@@ -48,37 +43,22 @@ static int vcpu_get_tsc_scaling_frac_bits(void *data, u64 *val)
 
 DEFINE_SIMPLE_ATTRIBUTE(vcpu_tsc_scaling_frac_fops, vcpu_get_tsc_scaling_frac_bits, NULL, "%llu\n");
 
-int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu)
+void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu)
 {
-        struct dentry *ret;
-
-        ret = debugfs_create_file("tsc-offset", 0444,
-                                                        vcpu->debugfs_dentry,
-                                                        vcpu, &vcpu_tsc_offset_fops);
-        if (!ret)
-                return -ENOMEM;
+        debugfs_create_file("tsc-offset", 0444, vcpu->debugfs_dentry, vcpu,
+                            &vcpu_tsc_offset_fops);
 
-        if (lapic_in_kernel(vcpu)) {
-                ret = debugfs_create_file("lapic_timer_advance_ns", 0444,
-                                                                vcpu->debugfs_dentry,
-                                                                vcpu, &vcpu_timer_advance_ns_fops);
-                if (!ret)
-                        return -ENOMEM;
-        }
+        if (lapic_in_kernel(vcpu))
+                debugfs_create_file("lapic_timer_advance_ns", 0444,
+                                    vcpu->debugfs_dentry, vcpu,
+                                    &vcpu_timer_advance_ns_fops);
 
         if (kvm_has_tsc_control) {
-                ret = debugfs_create_file("tsc-scaling-ratio", 0444,
-                                                        vcpu->debugfs_dentry,
-                                                        vcpu, &vcpu_tsc_scaling_fops);
-                if (!ret)
-                        return -ENOMEM;
-                ret = debugfs_create_file("tsc-scaling-ratio-frac-bits", 0444,
-                                                        vcpu->debugfs_dentry,
-                                                        vcpu, &vcpu_tsc_scaling_frac_fops);
-                if (!ret)
-                        return -ENOMEM;
-
+                debugfs_create_file("tsc-scaling-ratio", 0444,
+                                    vcpu->debugfs_dentry, vcpu,
+                                    &vcpu_tsc_scaling_fops);
+                debugfs_create_file("tsc-scaling-ratio-frac-bits", 0444,
+                                    vcpu->debugfs_dentry, vcpu,
+                                    &vcpu_tsc_scaling_frac_fops);
         }
-
-        return 0;
 }