* [PATCH] KVM: x86: removing unused variable
@ 2015-10-30 7:26 Saurabh Sengar
2015-11-02 12:02 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Saurabh Sengar @ 2015-10-30 7:26 UTC (permalink / raw)
To: glen, pbonzini, tglx, mingo, hpa, x86, kvm, linux-kernel; +Cc: Saurabh Sengar
removing unused variables, found by coccinelle
Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
---
arch/x86/kvm/x86.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9a9a198..ec15294 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3424,41 +3424,35 @@ static int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip)
static int kvm_vm_ioctl_get_pit(struct kvm *kvm, struct kvm_pit_state *ps)
{
- int r = 0;
-
mutex_lock(&kvm->arch.vpit->pit_state.lock);
memcpy(ps, &kvm->arch.vpit->pit_state, sizeof(struct kvm_pit_state));
mutex_unlock(&kvm->arch.vpit->pit_state.lock);
- return r;
+ return 0;
}
static int kvm_vm_ioctl_set_pit(struct kvm *kvm, struct kvm_pit_state *ps)
{
- int r = 0;
-
mutex_lock(&kvm->arch.vpit->pit_state.lock);
memcpy(&kvm->arch.vpit->pit_state, ps, sizeof(struct kvm_pit_state));
kvm_pit_load_count(kvm, 0, ps->channels[0].count, 0);
mutex_unlock(&kvm->arch.vpit->pit_state.lock);
- return r;
+ return 0;
}
static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
{
- int r = 0;
-
mutex_lock(&kvm->arch.vpit->pit_state.lock);
memcpy(ps->channels, &kvm->arch.vpit->pit_state.channels,
sizeof(ps->channels));
ps->flags = kvm->arch.vpit->pit_state.flags;
mutex_unlock(&kvm->arch.vpit->pit_state.lock);
memset(&ps->reserved, 0, sizeof(ps->reserved));
- return r;
+ return 0;
}
static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
{
- int r = 0, start = 0;
+ int start = 0;
u32 prev_legacy, cur_legacy;
mutex_lock(&kvm->arch.vpit->pit_state.lock);
prev_legacy = kvm->arch.vpit->pit_state.flags & KVM_PIT_FLAGS_HPET_LEGACY;
@@ -3470,7 +3464,7 @@ static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
kvm->arch.vpit->pit_state.flags = ps->flags;
kvm_pit_load_count(kvm, 0, kvm->arch.vpit->pit_state.channels[0].count, start);
mutex_unlock(&kvm->arch.vpit->pit_state.lock);
- return r;
+ return 0;
}
static int kvm_vm_ioctl_reinject(struct kvm *kvm,
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] KVM: x86: removing unused variable
2015-10-30 7:26 [PATCH] KVM: x86: removing unused variable Saurabh Sengar
@ 2015-11-02 12:02 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2015-11-02 12:02 UTC (permalink / raw)
To: Saurabh Sengar, glen, tglx, mingo, hpa, x86, kvm, linux-kernel
On 30/10/2015 08:26, Saurabh Sengar wrote:
> removing unused variables, found by coccinelle
>
> Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
> ---
> arch/x86/kvm/x86.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 9a9a198..ec15294 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -3424,41 +3424,35 @@ static int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip)
>
> static int kvm_vm_ioctl_get_pit(struct kvm *kvm, struct kvm_pit_state *ps)
> {
> - int r = 0;
> -
> mutex_lock(&kvm->arch.vpit->pit_state.lock);
> memcpy(ps, &kvm->arch.vpit->pit_state, sizeof(struct kvm_pit_state));
> mutex_unlock(&kvm->arch.vpit->pit_state.lock);
> - return r;
> + return 0;
> }
>
> static int kvm_vm_ioctl_set_pit(struct kvm *kvm, struct kvm_pit_state *ps)
> {
> - int r = 0;
> -
> mutex_lock(&kvm->arch.vpit->pit_state.lock);
> memcpy(&kvm->arch.vpit->pit_state, ps, sizeof(struct kvm_pit_state));
> kvm_pit_load_count(kvm, 0, ps->channels[0].count, 0);
> mutex_unlock(&kvm->arch.vpit->pit_state.lock);
> - return r;
> + return 0;
> }
>
> static int kvm_vm_ioctl_get_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
> {
> - int r = 0;
> -
> mutex_lock(&kvm->arch.vpit->pit_state.lock);
> memcpy(ps->channels, &kvm->arch.vpit->pit_state.channels,
> sizeof(ps->channels));
> ps->flags = kvm->arch.vpit->pit_state.flags;
> mutex_unlock(&kvm->arch.vpit->pit_state.lock);
> memset(&ps->reserved, 0, sizeof(ps->reserved));
> - return r;
> + return 0;
> }
>
> static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
> {
> - int r = 0, start = 0;
> + int start = 0;
> u32 prev_legacy, cur_legacy;
> mutex_lock(&kvm->arch.vpit->pit_state.lock);
> prev_legacy = kvm->arch.vpit->pit_state.flags & KVM_PIT_FLAGS_HPET_LEGACY;
> @@ -3470,7 +3464,7 @@ static int kvm_vm_ioctl_set_pit2(struct kvm *kvm, struct kvm_pit_state2 *ps)
> kvm->arch.vpit->pit_state.flags = ps->flags;
> kvm_pit_load_count(kvm, 0, kvm->arch.vpit->pit_state.channels[0].count, start);
> mutex_unlock(&kvm->arch.vpit->pit_state.lock);
> - return r;
> + return 0;
> }
>
> static int kvm_vm_ioctl_reinject(struct kvm *kvm,
>
Applied, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-11-02 12:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-30 7:26 [PATCH] KVM: x86: removing unused variable Saurabh Sengar
2015-11-02 12:02 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox