From patchwork Fri May 31 20:59:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2645551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id D2D78DFB79 for ; Fri, 31 May 2013 21:00:18 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiWQr-000092-3m; Fri, 31 May 2013 21:00:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiWQo-00034c-LY; Fri, 31 May 2013 21:00:14 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiWQl-00033z-Qj for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 21:00:12 +0000 Received: from wuerfel.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Lfnn4-1U3SBv2XcI-00pGba; Fri, 31 May 2013 22:59:45 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org, Christian Daudt , John Stultz , Thomas Gleixner Subject: [PATCH] clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change Date: Fri, 31 May 2013 22:59:44 +0200 Message-ID: <3174210.ZivUajNGev@wuerfel> User-Agent: KMail/4.10.2 (Linux/3.10.0-rc3-next-20130527+; KDE/4.10.3; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:84+SyI/KqY6jpB0s08cYDws9gKorjdQ8Dug+3ndaR8/ mglURmZzVIv22ePIJbSBlwRsKQNny5Dfs1/Sk2BeEsXUGvbZr1 rYL32p5S9ZyUuEQKIO1LxUvVfJGqPGBLqy/OZ9hX5XnJckgXNu ZEsJNxTWAcHdLZhYy0VabArsqvtp++x0Zfmgkz2+87NLI0QpbG GFTHqyB1COSwTIJgDQHDi5VLeWGuO7+8RNpiyMsyOKbSeUakiQ ZoXvMEV31P90ZjQY0B6vR3PGJ2hWr3Tcg3MwyAo2qKLzP/xoxS FQ4gepCovfz1g12PrAuveJpE6do7NJWZlK1y9IfQlf1TBCeLiR qEh+AtcSTL+Q8zdNcu/c= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_170012_086756_B375605F X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The CLOCKSOURCE_OF_DECLARE functions now take a device_node pointer as their argument, as of the clksrc/cleanup branch in arm-soc. This patch adapts the bcm_kona_timer driver to the new interface. This causes an annoying but harmless build-time warning, it would be nice to have this fixed in 3.10. Signed-off-by: Arnd Bergmann Cc: Christian Daudt Cc: John Stultz Acked-by: Christian Daudt diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c index 350f493..ba3d859 100644 --- a/drivers/clocksource/bcm_kona_timer.c +++ b/drivers/clocksource/bcm_kona_timer.c @@ -103,16 +103,10 @@ static const struct of_device_id bcm_timer_ids[] __initconst = { {}, }; -static void __init kona_timers_init(void) +static void __init kona_timers_init(struct device_node *node) { - struct device_node *node; u32 freq; - node = of_find_matching_node(NULL, bcm_timer_ids); - - if (!node) - panic("No timer"); - if (!of_property_read_u32(node, "clock-frequency", &freq)) arch_timer_rate = freq; else @@ -199,13 +193,12 @@ static struct irqaction kona_timer_irq = { .handler = kona_timer_interrupt, }; -static void __init kona_timer_init(void) +static void __init kona_timer_init(struct device_node *node) { - kona_timers_init(); + kona_timers_init(node); kona_timer_clockevents_init(); setup_irq(timers.tmr_irq, &kona_timer_irq); kona_timer_set_next_event((arch_timer_rate / HZ), NULL); } -CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", - kona_timer_init); +CLOCKSOURCE_OF_DECLARE(bcm_kona, "bcm,kona-timer", kona_timer_init);