From patchwork Tue Aug 6 01:28:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 264828 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1B2A72C007B for ; Tue, 6 Aug 2013 11:29:32 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6W5V-0000D7-3L; Tue, 06 Aug 2013 01:29:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6W5S-0007Au-QP; Tue, 06 Aug 2013 01:29:22 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1V6W5P-00079y-Sj for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2013 01:29:20 +0000 Received: from ayumi.isobedori.kobe.vergenet.net (p8155-ipbfp801kobeminato.hyogo.ocn.ne.jp [118.10.107.155]) by kirsty.vergenet.net (Postfix) with ESMTP id 4997225BF23; Tue, 6 Aug 2013 11:28:58 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id ED83BEDE107; Tue, 6 Aug 2013 10:28:56 +0900 (JST) Date: Tue, 6 Aug 2013 10:28:56 +0900 From: Simon Horman To: Magnus Damm Subject: Re: [PATCH 12/13] ARM: shmobile: Use clocksource_of_init() on r8a7790 Message-ID: <20130806012855.GB20940@verge.net.au> References: <20130731190110.31796.96552.sendpatchset@w520> <20130731190300.31796.23926.sendpatchset@w520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130731190300.31796.23926.sendpatchset@w520> Organisation: Horms Solutions Ltd. User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130805_212920_164775_E4AEA458 X-CRM114-Status: GOOD ( 18.60 ) 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 [202.4.237.240 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: olof@lixom.net, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Thu, Aug 01, 2013 at 04:03:00AM +0900, Magnus Damm wrote: > From: Magnus Damm > > Replace the call to shmobile_timer_init() with > clocksource_of_init(). This will allow us to > get rid of shmobile_timer_init(). > > Signed-off-by: Magnus Damm > --- > > arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- 0001/arch/arm/mach-shmobile/setup-r8a7790.c > +++ work/arch/arm/mach-shmobile/setup-r8a7790.c 2013-08-01 03:17:48.000000000 +0900 > @@ -263,7 +263,7 @@ void __init r8a7790_timer_init(void) > iounmap(base); > #endif /* CONFIG_ARM_ARCH_TIMER */ > > - shmobile_timer_init(); > + clocksource_of_init(); > } > > void __init r8a7790_init_delay(void) I seem to need the following: To avoid: ... CC arch/arm/mach-shmobile/setup-r8a7790.o arch/arm/mach-shmobile/setup-r8a7790.c: In function ‘r8a7790_timer_init’: arch/arm/mach-shmobile/setup-r8a7790.c:266:2: error: implicit declaration of function ‘clocksource_of_init’ [-Werror=implicit-function-declaration] cc1: some warnings being treated as errors make[1]: *** [arch/arm/mach-shmobile/setup-r8a7790.o] Error 1 diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index 7301255..d0f5c9f 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include #include