From patchwork Tue Oct 25 18:08:10 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: 4816 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 9AE9323E0E for ; Tue, 25 Oct 2011 18:13:04 +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 90497A1817C for ; Tue, 25 Oct 2011 18:13:04 +0000 (UTC) Received: by faan26 with SMTP id n26so1076935faa.11 for ; Tue, 25 Oct 2011 11:13:04 -0700 (PDT) Received: by 10.223.91.143 with SMTP id n15mr47474469fam.23.1319566384289; Tue, 25 Oct 2011 11:13:04 -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 7cs123508lak; Tue, 25 Oct 2011 11:13:03 -0700 (PDT) Received: by 10.236.129.141 with SMTP id h13mr43142119yhi.120.1319566382742; Tue, 25 Oct 2011 11:13:02 -0700 (PDT) Received: from e2.ny.us.ibm.com (e2.ny.us.ibm.com. [32.97.182.142]) by mx.google.com with ESMTPS id h6si11472681anp.115.2011.10.25.11.13.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 25 Oct 2011 11:13:02 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.142 as permitted sender) client-ip=32.97.182.142; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.142 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e2.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 25 Oct 2011 14:08:48 -0400 Received: from d01relay07.pok.ibm.com ([9.56.227.147]) by e2.ny.us.ibm.com ([192.168.1.102]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 25 Oct 2011 14:08:39 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9PI8Oix3039396 for ; Tue, 25 Oct 2011 14:08:24 -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 p9PI8NsM001547 for ; Tue, 25 Oct 2011 16:08:23 -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 p9PI8KhH001430; Tue, 25 Oct 2011 16:08:21 -0200 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 6CC921E74FA; Tue, 25 Oct 2011 11:08:20 -0700 (PDT) From: y@kernel.beaverton.ibm.com To: lkml Cc: John Stultz , Kyle McMartin , Thomas Gleixner Subject: [PATCH 2/8] clocksource: parisc: Convert to clocksource_register_hz/khz Date: Tue, 25 Oct 2011 11:08:10 -0700 Message-Id: <4ea6fc2e.06b4650a.3979.ffffe1b6SMTPIN_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-5112-0000-0000-000001459860 From: John Stultz This converts the parisc clocksources to use clocksource_register_hz/khz This is untested, so any assistance in testing would be appreciated! CC: Kyle McMartin CC: Thomas Gleixner Signed-off-by: John Stultz --- arch/parisc/kernel/time.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c index 45b7389..7c07743 100644 --- a/arch/parisc/kernel/time.c +++ b/arch/parisc/kernel/time.c @@ -198,8 +198,6 @@ static struct clocksource clocksource_cr16 = { .rating = 300, .read = read_cr16, .mask = CLOCKSOURCE_MASK(BITS_PER_LONG), - .mult = 0, /* to be set */ - .shift = 22, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -270,7 +268,5 @@ void __init time_init(void) /* register at clocksource framework */ current_cr16_khz = PAGE0->mem_10msec/10; /* kHz */ - clocksource_cr16.mult = clocksource_khz2mult(current_cr16_khz, - clocksource_cr16.shift); - clocksource_register(&clocksource_cr16); + clocksource_register_khz(&clocksource_cr16, current_cr16_khz); }