From patchwork Wed Jun 1 07:32:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 1694 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:28 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs293024vdc; Wed, 1 Jun 2011 00:32:56 -0700 (PDT) Received: by 10.91.63.40 with SMTP id q40mr5746418agk.166.1306913576190; Wed, 01 Jun 2011 00:32:56 -0700 (PDT) Received: from e5.ny.us.ibm.com (e5.ny.us.ibm.com [32.97.182.145]) by mx.google.com with ESMTPS id q26si1878955ann.136.2011.06.01.00.32.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Jun 2011 00:32:56 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.145 as permitted sender) client-ip=32.97.182.145; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.145 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p5175Uls029665 for ; Wed, 1 Jun 2011 03:05:30 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p517WtX4109850 for ; Wed, 1 Jun 2011 03:32:55 -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 p517WsIq026625 for ; Wed, 1 Jun 2011 03:32:54 -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 p517Ws4C026586; Wed, 1 Jun 2011 03:32:54 -0400 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 3BF7B1E7514; Wed, 1 Jun 2011 00:32:53 -0700 (PDT) From: John Stultz To: linux-kernel@vger.kernel.org Cc: John Stultz , Chris Metcalf , Thomas Gleixner Subject: [PATCH 6/6] clocksource: tile: convert to use clocksource_register_hz Date: Wed, 1 Jun 2011 00:32:50 -0700 Message-Id: <1306913570-9445-7-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 Convert tile to use clocksource_register_hz. Untested. Help from maintainers would be appreciated. CC: Chris Metcalf CC: Thomas Gleixner Signed-off-by: John Stultz --- arch/tile/kernel/time.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c index c4be58c..f6f50f2a 100644 --- a/arch/tile/kernel/time.c +++ b/arch/tile/kernel/time.c @@ -78,7 +78,6 @@ static struct clocksource cycle_counter_cs = { .rating = 300, .read = clocksource_get_cycles, .mask = CLOCKSOURCE_MASK(64), - .shift = 22, /* typical value, e.g. x86 tsc uses this */ .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -91,8 +90,6 @@ void __init setup_clock(void) cycles_per_sec = hv_sysconf(HV_SYSCONF_CPU_SPEED); sched_clock_mult = clocksource_hz2mult(cycles_per_sec, SCHED_CLOCK_SHIFT); - cycle_counter_cs.mult = - clocksource_hz2mult(cycles_per_sec, cycle_counter_cs.shift); } void __init calibrate_delay(void) @@ -107,7 +104,7 @@ void __init calibrate_delay(void) void __init time_init(void) { /* Initialize and register the clock source. */ - clocksource_register(&cycle_counter_cs); + clocksource_register_hz(&cycle_counter_cs, cycles_per_sec); /* Start up the tile-timer interrupt source on the boot cpu. */ setup_tile_timer();