From patchwork Thu Nov 24 06:07:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Blanchard X-Patchwork-Id: 127440 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id A9C45101B22 for ; Thu, 24 Nov 2011 17:15:19 +1100 (EST) Received: from localhost (ppp121-44-25-37.lns20.syd6.internode.on.net [121.44.25.37]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id C909F100991; Thu, 24 Nov 2011 17:14:24 +1100 (EST) X-Mailbox-Line: From anton@samba.org Thu Nov 24 17:08:47 2011 Message-Id: <20111124060847.472884831@samba.org> User-Agent: quilt/0.48-1 Date: Thu, 24 Nov 2011 17:07:21 +1100 From: Anton Blanchard To: benh@kernel.crashing.org, paulus@samba.org, johnstul@us.ibm.com, miltonm@bga.com Subject: [PATCH 5/6] powerpc/time: Fix some style issues References: <20111124060716.362614789@samba.org> Content-Disposition: inline; filename=clock5 Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Fix some formatting issues and use the DECREMENTER_MAX define instead of 0x7fffffff. Signed-off-by: Anton Blanchard Index: linux-build/arch/powerpc/kernel/time.c =================================================================== --- linux-build.orig/arch/powerpc/kernel/time.c 2011-11-24 16:49:25.853715846 +1100 +++ linux-build/arch/powerpc/kernel/time.c 2011-11-24 16:51:04.651432999 +1100 @@ -106,12 +106,12 @@ static void decrementer_set_mode(enum cl struct clock_event_device *dev); static struct clock_event_device decrementer_clockevent = { - .name = "decrementer", - .rating = 200, - .irq = 0, - .set_next_event = decrementer_set_next_event, - .set_mode = decrementer_set_mode, - .features = CLOCK_EVT_FEAT_ONESHOT, + .name = "decrementer", + .rating = 200, + .irq = 0, + .set_next_event = decrementer_set_next_event, + .set_mode = decrementer_set_mode, + .features = CLOCK_EVT_FEAT_ONESHOT, }; struct decrementer_clock { @@ -435,7 +435,7 @@ EXPORT_SYMBOL(profile_pc); /* * This function recalibrates the timebase based on the 49-bit time-of-day * value in the Titan chip. The Titan is much more accurate than the value - * returned by the service processor for the timebase frequency. + * returned by the service processor for the timebase frequency. */ static int __init iSeries_tb_recal(void) @@ -636,9 +636,9 @@ static void generic_suspend_disable_irqs * with suspending. */ - set_dec(0x7fffffff); + set_dec(DECREMENTER_MAX); local_irq_disable(); - set_dec(0x7fffffff); + set_dec(DECREMENTER_MAX); } static void generic_suspend_enable_irqs(void) @@ -982,10 +982,10 @@ void __init time_init(void) boot_tb = get_tb_or_rtc(); /* If platform provided a timezone (pmac), we correct the time */ - if (timezone_offset) { + if (timezone_offset) { sys_tz.tz_minuteswest = -timezone_offset / 60; sys_tz.tz_dsttime = 0; - } + } vdso_data->tb_update_count = 0; vdso_data->tb_ticks_per_sec = tb_ticks_per_sec;