From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139AbbCMJEo (ORCPT ); Fri, 13 Mar 2015 05:04:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57836 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751946AbbCMJEg (ORCPT ); Fri, 13 Mar 2015 05:04:36 -0400 Date: Fri, 13 Mar 2015 02:04:00 -0700 From: tip-bot for John Stultz Message-ID: Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, john.stultz@linaro.org, richardcochran@gmail.com, tglx@linutronix.de, peterz@infradead.org, davem@davemloft.net, prarit@redhat.com, sboyd@codeaurora.org, davej@codemonkey.org.uk Reply-To: mingo@kernel.org, sboyd@codeaurora.org, davej@codemonkey.org.uk, prarit@redhat.com, davem@davemloft.net, richardcochran@gmail.com, tglx@linutronix.de, peterz@infradead.org, john.stultz@linaro.org, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org In-Reply-To: <1426133800-29329-11-git-send-email-john.stultz@linaro.org> References: <1426133800-29329-11-git-send-email-john.stultz@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] clocksource, sparc32: Convert to using clocksource_register_hz() Git-Commit-ID: 3142f76022fe46f6e0a0d3940b23fb6ccb794692 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3142f76022fe46f6e0a0d3940b23fb6ccb794692 Gitweb: http://git.kernel.org/tip/3142f76022fe46f6e0a0d3940b23fb6ccb794692 Author: John Stultz AuthorDate: Wed, 11 Mar 2015 21:16:38 -0700 Committer: Ingo Molnar CommitDate: Fri, 13 Mar 2015 08:07:07 +0100 clocksource, sparc32: Convert to using clocksource_register_hz() While cleaning up some clocksource code, I noticed the time_32 implementation uses the clocksource_hz2mult() helper, but doesn't use the clocksource_register_hz() method. I don't believe the Sparc clocksource is a default clocksource, so we shouldn't need to self-define the mult/shift pair. So convert the time_32.c implementation to use clocksource_register_hz(). Untested. Signed-off-by: John Stultz Acked-by: David S. Miller Cc: Dave Jones Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Prarit Bhargava Cc: Richard Cochran Cc: Stephen Boyd Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1426133800-29329-11-git-send-email-john.stultz@linaro.org Signed-off-by: Ingo Molnar --- arch/sparc/kernel/time_32.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c index a31c0c8..18147a5 100644 --- a/arch/sparc/kernel/time_32.c +++ b/arch/sparc/kernel/time_32.c @@ -181,17 +181,13 @@ static struct clocksource timer_cs = { .rating = 100, .read = timer_cs_read, .mask = CLOCKSOURCE_MASK(64), - .shift = 2, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static __init int setup_timer_cs(void) { timer_cs_enabled = 1; - timer_cs.mult = clocksource_hz2mult(sparc_config.clock_rate, - timer_cs.shift); - - return __clocksource_register(&timer_cs); + return clocksource_register_hz(&timer_cs, sparc_config.clock_rate); } #ifdef CONFIG_SMP