diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 21c624170f3116452fcf4cdd3e5e70db681b29fa..c313587c7622bacf01a77ab7c3aa60bc3fee618d 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9933,13 +9933,8 @@ static int complete_hypercall_exit(struct kvm_vcpu *vcpu)
 {
 	u64 ret = vcpu->run->hypercall.ret;
 
-	/* Use is_64_bit_hypercall() instead of is_64_bit_mode() for Hygon CPUs */
-	if (is_x86_vendor_hygon()) {
-		if (!is_64_bit_hypercall(vcpu))
-			ret = (u32)ret;
-	} else if (!is_64_bit_mode(vcpu)) {
+	if (!is_64_bit_hypercall(vcpu))
 		ret = (u32)ret;
-	}
 	kvm_rax_write(vcpu, ret);
 	++vcpu->stat.hypercalls;
 	return kvm_skip_emulated_instruction(vcpu);