From patchwork Fri Mar 2 07:12:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 7059 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 E5FA523E4A for ; Fri, 2 Mar 2012 07:13:29 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id A53DEA18497 for ; Fri, 2 Mar 2012 07:13:29 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so2587473iag.11 for ; Thu, 01 Mar 2012 23:13:29 -0800 (PST) Received: from mr.google.com ([10.50.207.72]) by 10.50.207.72 with SMTP id lu8mr708035igc.0.1330672409515 (num_hops = 1); Thu, 01 Mar 2012 23:13:29 -0800 (PST) MIME-Version: 1.0 Received: by 10.50.207.72 with SMTP id lu8mr585274igc.0.1330672409472; Thu, 01 Mar 2012 23:13:29 -0800 (PST) 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.231.53.18 with SMTP id k18csp3358ibg; Thu, 1 Mar 2012 23:13:29 -0800 (PST) Received: by 10.68.130.138 with SMTP id oe10mr10483516pbb.24.1330672408854; Thu, 01 Mar 2012 23:13:28 -0800 (PST) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id r4si6877970pbi.215.2012.03.01.23.13.28 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 23:13:28 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.110.154 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Mar 2012 00:13:27 -0700 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 2 Mar 2012 00:13:02 -0700 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 57ADE19D804F; Fri, 2 Mar 2012 00:12:56 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q227D1WY166844; Fri, 2 Mar 2012 00:13:01 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q227D04a003959; Fri, 2 Mar 2012 00:13:01 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q227D0of003949; Fri, 2 Mar 2012 00:13:00 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 194EBC03E9; Thu, 1 Mar 2012 23:12:59 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Ingo Molnar , Thomas Gleixner , Eric Dumazet , Richard Cochran Subject: [PATCH 8/9] time: Whitespace cleanups per Ingo's requests Date: Thu, 1 Mar 2012 23:12:47 -0800 Message-Id: <1330672368-32290-9-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1330672368-32290-1-git-send-email-john.stultz@linaro.org> References: <1330672368-32290-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12030207-3352-0000-0000-0000030CF670 X-Gm-Message-State: ALoCoQlag6wax7gwy+xrshV+1vMhMsBPbQtoiRc9hFDcciKNmn2q3T1hL5x+IdZri76QWNONYgtE Ingo noted a number of places where there is inconsistent use of whitespace. This patch tries to address the main culprits. CC: Ingo Molnar CC: Thomas Gleixner CC: Eric Dumazet CC: Richard Cochran Signed-off-by: John Stultz --- kernel/time/timekeeping.c | 35 ++++++++++++++++------------------- 1 files changed, 16 insertions(+), 19 deletions(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 2ceee24..67983ff 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -24,34 +24,31 @@ /* Structure holding internal timekeeping values. */ struct timekeeper { /* Current clocksource used for timekeeping. */ - struct clocksource *clock; + struct clocksource *clock; /* NTP adjusted clock multiplier */ - u32 mult; + u32 mult; /* The shift value of the current clocksource. */ - int shift; + int shift; /* cycle value at last accumulation point */ - cycle_t cycle_last; + cycle_t cycle_last; /* Number of clock cycles in one NTP interval. */ - cycle_t cycle_interval; + cycle_t cycle_interval; /* Number of clock shifted nano seconds in one NTP interval. */ - u64 xtime_interval; + u64 xtime_interval; /* shifted nano seconds left over when rounding cycle_interval */ - s64 xtime_remainder; + s64 xtime_remainder; /* Raw nano seconds accumulated per NTP interval. */ - u32 raw_interval; - + u32 raw_interval; /* Current CLOCK_REALTIME time in seconds */ - u64 xtime_sec; + u64 xtime_sec; /* Clock shifted nano seconds */ - u64 xtime_nsec; - + u64 xtime_nsec; /* Difference between accumulated time and NTP time in ntp * shifted nano seconds. */ - s64 ntp_error; + s64 ntp_error; /* Shift conversion between clock shifted nano seconds and * ntp shifted nano seconds. */ - int ntp_error_shift; - + int ntp_error_shift; /* * wall_to_monotonic is what we need to add to xtime (or xtime corrected * for sub jiffie times) to get to monotonic time. Monotonic is pegged @@ -66,12 +63,11 @@ struct timekeeper { * - wall_to_monotonic is no longer the boot time, getboottime must be * used instead. */ - struct timespec wall_to_monotonic; + struct timespec wall_to_monotonic; /* time spent in suspend */ - struct timespec total_sleep_time; + struct timespec total_sleep_time; /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ - struct timespec raw_time; - + struct timespec raw_time; }; static struct timekeeper timekeeper; @@ -596,6 +592,7 @@ u64 timekeeping_max_deferment(void) { unsigned long seq; u64 ret; + do { seq = read_seqcount_begin(&timekeeper_rlock);