From patchwork Wed Jun 1 07:32:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1698 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:54:29 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs293025vdc; Wed, 1 Jun 2011 00:32:57 -0700 (PDT) Received: by 10.91.153.7 with SMTP id f7mr5787358ago.36.1306913577506; Wed, 01 Jun 2011 00:32:57 -0700 (PDT) Received: from e1.ny.us.ibm.com (e1.ny.us.ibm.com [32.97.182.141]) by mx.google.com with ESMTPS id l17si1877542anm.146.2011.06.01.00.32.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Jun 2011 00:32:57 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.141 as permitted sender) client-ip=32.97.182.141; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.141 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e1.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p517LS7b031119 for ; Wed, 1 Jun 2011 03:21:28 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p517Wu281380364 for ; Wed, 1 Jun 2011 03:32:56 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p517WsHu026634 for ; Wed, 1 Jun 2011 03:32:55 -0400 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p517Wsxa026585; Wed, 1 Jun 2011 03:32:54 -0400 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 342E61E7513; Wed, 1 Jun 2011 00:32:53 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Mikael Starvik , Jesper Nilsson , Thomas Gleixner Subject: [PATCH 5/6] clocksource: cris: convert to clocksource_register_khz Date: Wed, 1 Jun 2011 00:32:49 -0700 Message-Id: <1306913570-9445-6-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1306913570-9445-1-git-send-email-john.stultz@linaro.org> References: <1306913570-9445-1-git-send-email-john.stultz@linaro.org> 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);