From patchwork Tue Oct 25 18:08:13 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: 4813 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 0C6B423E0E for ; Tue, 25 Oct 2011 18:11:24 +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 F0134A1817B for ; Tue, 25 Oct 2011 18:11:23 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id n26so1073400faa.11 for ; Tue, 25 Oct 2011 11:11:23 -0700 (PDT) Received: by 10.223.77.71 with SMTP id f7mr52749272fak.33.1319566283820; Tue, 25 Oct 2011 11:11:23 -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 7cs123465lak; Tue, 25 Oct 2011 11:11:23 -0700 (PDT) Received: by 10.236.191.71 with SMTP id f47mr14487484yhn.7.1319566282560; Tue, 25 Oct 2011 11:11:22 -0700 (PDT) Received: from e3.ny.us.ibm.com (e3.ny.us.ibm.com. [32.97.182.143]) by mx.google.com with ESMTPS id s67si24700157yhs.106.2011.10.25.11.11.22 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 11:11:22 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.143 as permitted sender) client-ip=32.97.182.143; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.143 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e3.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Oct 2011 14:09:21 -0400 Received: from d01relay03.pok.ibm.com ([9.56.227.235]) by e3.ny.us.ibm.com ([192.168.1.103]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 25 Oct 2011 14:08:31 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9PI8RRh201594 for ; Tue, 25 Oct 2011 14:08:27 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9PI8QPN001846 for ; Tue, 25 Oct 2011 16:08:27 -0200 Received: from kernel.beaverton.ibm.com ([9.47.67.96]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p9PI8KX3001434; Tue, 25 Oct 2011 16:08:21 -0200 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 8546C1E74FF; Tue, 25 Oct 2011 11:08:20 -0700 (PDT) From: y@kernel.beaverton.ibm.com To: lkml Cc: John Stultz , Mikael Starvik , Jesper Nilsson , Thomas Gleixner Subject: [PATCH 5/8] clocksource: cris: Convert to clocksource_register_khz Date: Tue, 25 Oct 2011 11:08:13 -0700 Message-Id: <4ea6fbca.6716ec0a.0e26.4b3cSMTPIN_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-8974-0000-0000-00000118BA2D From: John Stultz This converts the cris architecture to use clocksource_register_khz This is untested, so any help from maintainers would be appreciated. CC: Mikael Starvik CC: Jesper Nilsson CC: Thomas Gleixner Signed-off-by: John Stultz --- arch/cris/arch-v32/kernel/time.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index bb978ed..6773fc8 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c @@ -47,14 +47,12 @@ static struct clocksource cont_rotime = { .rating = 300, .read = read_cont_rotime, .mask = CLOCKSOURCE_MASK(32), - .shift = 10, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init etrax_init_cont_rotime(void) { - cont_rotime.mult = clocksource_khz2mult(100000, cont_rotime.shift); - clocksource_register(&cont_rotime); + clocksource_register_khz(&cont_rotime, 100000); return 0; } arch_initcall(etrax_init_cont_rotime);