From patchwork Tue Jun 22 00:54:19 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Amos Kong <akong@redhat.com>
X-Patchwork-Id: 107315
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5M0sc9Q030080
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 22 Jun 2010 00:54:38 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751703Ab0FVAyg (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Mon, 21 Jun 2010 20:54:36 -0400
Received: from mx1.redhat.com ([209.132.183.28]:52865 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750986Ab0FVAyg (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 21 Jun 2010 20:54:36 -0400
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5M0salh017742
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Mon, 21 Jun 2010 20:54:36 -0400
Received: from localhost.localdomain (vpn2-8-13.sin2.redhat.com [10.67.8.13])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o5M0sWbO032714; Mon, 21 Jun 2010 20:54:33 -0400
From: akong@redhat.com
To: avi@redhat.com
Cc: kvm@vger.kernel.org, Amos Kong <akong@redhat.com>
Subject: [PATCH] KVM: Remove redundant change of return value
Date: Tue, 22 Jun 2010 08:54:19 +0800
Message-Id: <1277168059-4367-1-git-send-email-akong@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 22 Jun 2010 00:54:39 +0000 (UTC)


diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 33156a3..a23bfa0 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2477,7 +2477,6 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 		r = kvm_vcpu_ioctl_set_lapic(vcpu, u.lapic);
 		if (r)
 			goto out;
-		r = 0;
 		break;
 	}
 	case KVM_INTERRUPT: {
@@ -2489,14 +2488,12 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
 		r = kvm_vcpu_ioctl_interrupt(vcpu, &irq);
 		if (r)
 			goto out;
-		r = 0;
 		break;
 	}
 	case KVM_NMI: {
 		r = kvm_vcpu_ioctl_nmi(vcpu);
 		if (r)
 			goto out;
-		r = 0;
 		break;
 	}
 	case KVM_SET_CPUID: {
@@ -3227,7 +3224,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
 		r = kvm_vm_ioctl_set_irqchip(kvm, chip);
 		if (r)
 			goto set_irqchip_out;
-		r = 0;
 	set_irqchip_out:
 		kfree(chip);
 		if (r)
@@ -3260,7 +3256,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
 		r = kvm_vm_ioctl_set_pit(kvm, &u.ps);
 		if (r)
 			goto out;
-		r = 0;
 		break;
 	}
 	case KVM_GET_PIT2: {
@@ -3286,7 +3281,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
 		r = kvm_vm_ioctl_set_pit2(kvm, &u.ps2);
 		if (r)
 			goto out;
-		r = 0;
 		break;
 	}
 	case KVM_REINJECT_CONTROL: {
@@ -3297,7 +3291,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
 		r = kvm_vm_ioctl_reinject(kvm, &control);
 		if (r)
 			goto out;
-		r = 0;
 		break;
 	}
 	case KVM_XEN_HVM_CONFIG: {