From patchwork Tue Oct 25 18:08:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@kernel.beaverton.ibm.com X-Patchwork-Id: 4811 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 605BC23E0E for ; Tue, 25 Oct 2011 18:09:10 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 573D9A18076 for ; Tue, 25 Oct 2011 18:09:10 +0000 (UTC) Received: by faan26 with SMTP id n26so1070394faa.11 for ; Tue, 25 Oct 2011 11:09:10 -0700 (PDT) Received: by 10.223.91.143 with SMTP id n15mr47453759fam.23.1319566150127; Tue, 25 Oct 2011 11:09:10 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.1.71 with SMTP id 7cs123391lak; Tue, 25 Oct 2011 11:09:09 -0700 (PDT) Received: by 10.236.189.40 with SMTP id b28mr42160814yhn.98.1319566148916; Tue, 25 Oct 2011 11:09:08 -0700 (PDT) Received: from e37.co.us.ibm.com (e37.co.us.ibm.com. [32.97.110.158]) by mx.google.com with ESMTPS id y11si6574957anc.57.2011.10.25.11.09.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 11:09:08 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.158 as permitted sender) client-ip=32.97.110.158; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.158 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Oct 2011 12:08:53 -0600 Received: from d03relay05.boulder.ibm.com ([9.17.195.107]) by e37.co.us.ibm.com ([192.168.1.137]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 25 Oct 2011 12:08:42 -0600 Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9PI8OGV159654 for ; Tue, 25 Oct 2011 12:08:28 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9PI8NXw031268 for ; Tue, 25 Oct 2011 12:08:23 -0600 Received: from kernel.beaverton.ibm.com ([9.47.67.96]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p9PI8N9t031237; Tue, 25 Oct 2011 12:08:23 -0600 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 9CA101E7503; Tue, 25 Oct 2011 11:08:20 -0700 (PDT) From: y@kernel.beaverton.ibm.com To: lkml Cc: John Stultz , Thomas Gleixner , "K. Y. Srinivasan" Subject: [PATCH 8/8] clocksource: hyperv: Convert to clocksource_register_khz Date: Tue, 25 Oct 2011 11:08:16 -0700 Message-Id: <4ea6fb44.0b7e640a.6df1.1a05SMTPIN_ADDED@mx.google.com> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1319566096-3222-1-git-send-email-y> References: <1319566096-3222-1-git-send-email-y> x-cbid: 11102518-7408-0000-0000-0000005850AF From: John Stultz Convert to using clocksource_register_khz Signed-off-by: John Stultz CC: Thomas Gleixner CC: K. Y. Srinivasan --- drivers/staging/hv/hv_timesource.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/drivers/staging/hv/hv_timesource.c b/drivers/staging/hv/hv_timesource.c index 2b0f9aa..0379b2d 100644 --- a/drivers/staging/hv/hv_timesource.c +++ b/drivers/staging/hv/hv_timesource.c @@ -50,14 +50,6 @@ static struct clocksource hyperv_cs = { .rating = 400, /* use this when running on Hyperv*/ .read = read_hv_clock, .mask = CLOCKSOURCE_MASK(64), - /* - * The time ref counter in HyperV is in 100ns units. - * The definition of mult is: - * mult/2^shift = ns/cyc = 100 - * mult = (100 << shift) - */ - .mult = (100 << HV_CLOCK_SHIFT), - .shift = HV_CLOCK_SHIFT, }; static const struct dmi_system_id __initconst @@ -92,7 +84,7 @@ static int __init init_hv_clocksource(void) return -ENODEV; pr_info("Registering HyperV clock source\n"); - return clocksource_register(&hyperv_cs); + return clocksource_register_khz(&hyperv_cs, 10000); } module_init(init_hv_clocksource);