From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBhbf-0007rj-Ep for qemu-devel@nongnu.org; Wed, 23 Dec 2015 06:29:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBhbc-0002Eb-98 for qemu-devel@nongnu.org; Wed, 23 Dec 2015 06:29:23 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:33898 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBhbb-0002EA-RE for qemu-devel@nongnu.org; Wed, 23 Dec 2015 06:29:20 -0500 From: Andrey Smetanin Date: Wed, 23 Dec 2015 14:28:36 +0300 Message-Id: <1450870121-15943-2-git-send-email-asmetanin@virtuozzo.com> In-Reply-To: <1450870121-15943-1-git-send-email-asmetanin@virtuozzo.com> References: <1450870121-15943-1-git-send-email-asmetanin@virtuozzo.com> Subject: [Qemu-devel] [PATCH v1 1/6] kvm/x86: Drop stimer_stop() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kvm@vger.kernel.org Cc: Gleb Natapov , Paolo Bonzini , qemu-devel@nongnu.org, Roman Kagan , "Denis V. Lunev" The function stimer_stop() is called in one place so remove the function and replace it's call by function content. Signed-off-by: Andrey Smetanin Reviewed-by: Roman Kagan CC: Gleb Natapov CC: Paolo Bonzini CC: Roman Kagan CC: Denis V. Lunev CC: qemu-devel@nongnu.org --- arch/x86/kvm/hyperv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index f34f666..ec3a900 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -400,16 +400,11 @@ static void stimer_mark_expired(struct kvm_vcpu_hv_stimer *stimer, kvm_vcpu_kick(vcpu); } -static void stimer_stop(struct kvm_vcpu_hv_stimer *stimer) -{ - hrtimer_cancel(&stimer->timer); -} - static void stimer_cleanup(struct kvm_vcpu_hv_stimer *stimer) { struct kvm_vcpu *vcpu = stimer_to_vcpu(stimer); - stimer_stop(stimer); + hrtimer_cancel(&stimer->timer); clear_bit(stimer->index, vcpu_to_hv_vcpu(vcpu)->stimer_pending_bitmap); stimer->msg_pending = false; -- 2.4.3