From patchwork Wed May 11 13:30:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9070011 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2800A9F30C for ; Wed, 11 May 2016 13:32:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4CB22200ED for ; Wed, 11 May 2016 13:32:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6EE2520114 for ; Wed, 11 May 2016 13:32:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932520AbcEKNc2 (ORCPT ); Wed, 11 May 2016 09:32:28 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:37450 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932586AbcEKNcS (ORCPT ); Wed, 11 May 2016 09:32:18 -0400 Received: by mail-wm0-f45.google.com with SMTP id a17so83074242wme.0 for ; Wed, 11 May 2016 06:32:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z726cdJfQZBBXCvT68A0XQSlHZQUa3Pk3x7yUajq7wU=; b=GR8eeKAHZvuH4PF/M6u2rAP7mnpF3YUoi5spT7914IxFbMW9Uo0sHoSh5Q8R0BNXtZ DxLpd8vrlR3uRIpPy4v+OE48hci11zH6Okc3CINyvshfcQ+U+bwYv8vga+zpzzhTem6z igb/atXsYStXGzFV5jfkTNsduHqoPBoPSBacA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Z726cdJfQZBBXCvT68A0XQSlHZQUa3Pk3x7yUajq7wU=; b=FNqK1ZEnNOI3GPFDyxFAcHIgy1PPoyKkp+gE0CxjfRetIQ0QMOWeMu5tPGhe3SE+gp 6Bs+CdEYeAgDNTFGC7wB2L75S4O5bO7PPZ9vfw07m0YXgiUls8JDuAPlJ7xzWzKc1Hc8 MEQXQIB2SL0H1pKj3h3rAQdPhJKWXPgxJlCbZRK43KEnw0OhcXUQN5g4RdnuzLbjuifu l+hpiMletQPjUIE/m5dpzqGHjmMgUlaxsu6umHtELkKtvz8HUDDJNM6mIdX7nxO08w12 7IXCOY94INyHET14Yf+1jT2J+ZNoSCBHH2tTehqX0L7iDmwdPwXNPxEoIjb0rUV7AfJs 7Ixg== X-Gm-Message-State: AOPr4FWo7l+toWitBlFhd8uAVU0yhzcQz/anMUJD8jMYRG9TiuwQLA9PCCPX683wMuLQp8gH X-Received: by 10.28.213.137 with SMTP id m131mr4563066wmg.24.1462973537066; Wed, 11 May 2016 06:32:17 -0700 (PDT) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id 131sm8547278wmu.17.2016.05.11.06.32.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 May 2016 06:32:16 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Marc Zyngier , Julien Grall , Christoffer Dall Subject: [PULL 28/29] clocksource: arm_arch_timer: Remove arch_timer_get_timecounter Date: Wed, 11 May 2016 15:30:21 +0200 Message-Id: <1462973422-10021-29-git-send-email-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.1.2.330.g565301e.dirty In-Reply-To: <1462973422-10021-1-git-send-email-christoffer.dall@linaro.org> References: <1462973422-10021-1-git-send-email-christoffer.dall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Julien Grall The only call of arch_timer_get_timecounter (in KVM) has been removed. Signed-off-by: Julien Grall Acked-by: Christoffer Dall Signed-off-by: Christoffer Dall --- drivers/clocksource/arm_arch_timer.c | 5 ----- include/clocksource/arm_arch_timer.h | 6 ------ 2 files changed, 11 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index bb58224..4814446 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -475,11 +475,6 @@ struct arch_timer_kvm_info *arch_timer_get_kvm_info(void) return &arch_timer_kvm_info; } -struct timecounter *arch_timer_get_timecounter(void) -{ - return &arch_timer_kvm_info.timecounter; -} - static void __init arch_counter_register(unsigned type) { u64 start_count; diff --git a/include/clocksource/arm_arch_timer.h b/include/clocksource/arm_arch_timer.h index 9dd996a..caedb74 100644 --- a/include/clocksource/arm_arch_timer.h +++ b/include/clocksource/arm_arch_timer.h @@ -58,7 +58,6 @@ struct arch_timer_kvm_info { extern u32 arch_timer_get_rate(void); extern u64 (*arch_timer_read_counter)(void); -extern struct timecounter *arch_timer_get_timecounter(void); extern struct arch_timer_kvm_info *arch_timer_get_kvm_info(void); #else @@ -73,11 +72,6 @@ static inline u64 arch_timer_read_counter(void) return 0; } -static inline struct timecounter *arch_timer_get_timecounter(void) -{ - return NULL; -} - #endif #endif