From patchwork Wed Dec 19 18:18:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soren Brinkmann X-Patchwork-Id: 1896651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id C2893DF215 for ; Wed, 19 Dec 2012 18:23:49 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TlOFr-0000Ov-8y; Wed, 19 Dec 2012 18:20:31 +0000 Received: from db3ehsobe006.messaging.microsoft.com ([213.199.154.144] helo=db3outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TlOEY-0008PA-2Q for linux-arm-kernel@lists.infradead.org; Wed, 19 Dec 2012 18:19:14 +0000 Received: from mail14-db3-R.bigfish.com (10.3.81.232) by DB3EHSOBE003.bigfish.com (10.3.84.23) with Microsoft SMTP Server id 14.1.225.23; Wed, 19 Dec 2012 18:19:08 +0000 Received: from mail14-db3 (localhost [127.0.0.1]) by mail14-db3-R.bigfish.com (Postfix) with ESMTP id 0F9AEA01B2; Wed, 19 Dec 2012 18:19:08 +0000 (UTC) X-Forefront-Antispam-Report: CIP:149.199.60.83; KIP:(null); UIP:(null); IPV:NLI; H:xsj-gw1; RD:unknown-60-83.xilinx.com; EFVD:NLI X-SpamScore: 1 X-BigFish: VPS1(zzzz1de0h1202h1e76h1d1ah1d2ahzz8275bhz2fh95h668h839hd24hf0ah119dh1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h14ddh1504h1537h162dh1631h1758h906i1155h) Received-SPF: pass (mail14-db3: domain of xilinx.com designates 149.199.60.83 as permitted sender) client-ip=149.199.60.83; envelope-from=soren.brinkmann@xilinx.com; helo=xsj-gw1 ; helo=xsj-gw1 ; Received: from mail14-db3 (localhost.localdomain [127.0.0.1]) by mail14-db3 (MessageSwitch) id 1355941145225179_15154; Wed, 19 Dec 2012 18:19:05 +0000 (UTC) Received: from DB3EHSMHS012.bigfish.com (unknown [10.3.81.254]) by mail14-db3.bigfish.com (Postfix) with ESMTP id 343692A00F5; Wed, 19 Dec 2012 18:19:05 +0000 (UTC) Received: from xsj-gw1 (149.199.60.83) by DB3EHSMHS012.bigfish.com (10.3.87.112) with Microsoft SMTP Server id 14.1.225.23; Wed, 19 Dec 2012 18:19:03 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-smtp1.xilinx.com) by xsj-gw1 with esmtp (Exim 4.63) (envelope-from ) id 1TlOEQ-0002QS-V8; Wed, 19 Dec 2012 10:19:02 -0800 From: Soren Brinkmann To: Michal Simek , Subject: [PATCH v2 6/7] arm: zynq: timer: Fix comment style Date: Wed, 19 Dec 2012 10:18:41 -0800 X-Mailer: git-send-email 1.8.0.2 In-Reply-To: References: X-RCIS-Action: ALLOW MIME-Version: 1.0 Message-ID: <07f27d3f-d6cd-44e6-95fe-739f9583a3bd@DB3EHSMHS012.ehs.local> X-OriginatorOrg: xilinx.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121219_131910_537933_9439AAB8 X-CRM114-Status: GOOD ( 10.87 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.144 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Soren Brinkmann , josh.cartwright@ni.com, nbowler@elliptictech.com, Arnd Bergmann , linux-kernel@vger.kernel.org, git@xilinx.com, John Linn , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Fixing multi line comment style at two locations. Signed-off-by: Soren Brinkmann Reviewed-by: Josh Cartwright --- arch/arm/mach-zynq/timer.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-zynq/timer.c b/arch/arm/mach-zynq/timer.c index 2b23d0f..7b2e047 100644 --- a/arch/arm/mach-zynq/timer.c +++ b/arch/arm/mach-zynq/timer.c @@ -36,7 +36,8 @@ #define XTTCPS_CNT_CNTRL_DISABLE_MASK 0x1 -/* Setup the timers to use pre-scaling, using a fixed value for now that will +/* + * Setup the timers to use pre-scaling, using a fixed value for now that will * work across most input frequency, but it may need to be more dynamic */ #define PRESCALE_EXPONENT 11 /* 2 ^ PRESCALE_EXPONENT = PRESCALE */ @@ -89,8 +90,10 @@ static void xttcps_set_interval(struct xttcps_timer *timer, __raw_writel(cycles, timer->base_addr + XTTCPS_INTR_VAL_OFFSET); - /* Reset the counter (0x10) so that it starts from 0, one-shot - mode makes this needed for timing to be right. */ + /* + * Reset the counter (0x10) so that it starts from 0, one-shot + * mode makes this needed for timing to be right. + */ ctrl_reg |= CNT_CNTRL_RESET; ctrl_reg &= ~XTTCPS_CNT_CNTRL_DISABLE_MASK; __raw_writel(ctrl_reg, timer->base_addr + XTTCPS_CNT_CNTRL_OFFSET);